diff --git a/src/com/android/settings/AccessiblePreferenceCategory.java b/src/com/android/settings/AccessiblePreferenceCategory.java index 494dee5b933753c423d679979d17e9e08ecf13be..6e1a3d5f408901480e7b01f6737cf3a8caca1c1b 100644 --- a/src/com/android/settings/AccessiblePreferenceCategory.java +++ b/src/com/android/settings/AccessiblePreferenceCategory.java @@ -17,6 +17,7 @@ package com.android.settings; import android.content.Context; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceViewHolder; diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java index 86d8336d2558b7bb57e8648107e479ebbf788736..b3cf43357890a829fe380857d5e20a69d19389f0 100644 --- a/src/com/android/settings/BrightnessPreference.java +++ b/src/com/android/settings/BrightnessPreference.java @@ -19,9 +19,10 @@ package com.android.settings; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import androidx.preference.Preference; import android.util.AttributeSet; +import androidx.preference.Preference; + public class BrightnessPreference extends Preference { public BrightnessPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/CancellablePreference.java b/src/com/android/settings/CancellablePreference.java index 92c100327cfb1c5c2890f2233410e8617e0f62d6..4288e8b60f8e948bda8e596ade8b82b3faf27d95 100644 --- a/src/com/android/settings/CancellablePreference.java +++ b/src/com/android/settings/CancellablePreference.java @@ -16,13 +16,14 @@ package com.android.settings; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class CancellablePreference extends Preference implements OnClickListener { private boolean mCancellable; diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index cb87440f7a65b4a30f7520695eb197878028a8d8..97910ec9420105bda5a31b74ea242e2b9ce7ab56 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -25,10 +25,11 @@ import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.os.Bundle; -import androidx.preference.ListPreferenceDialogFragment; -import androidx.preference.ListPreference; import android.util.AttributeSet; +import androidx.preference.ListPreference; +import androidx.preference.ListPreferenceDialogFragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java index 5f7b6392369f87def41821d139ff30fc870d54f3..9207dc869adeb8014c9ed206e4a2c9bd58141fa1 100644 --- a/src/com/android/settings/FallbackHome.java +++ b/src/com/android/settings/FallbackHome.java @@ -17,24 +17,21 @@ package com.android.settings; import android.app.Activity; -import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import android.os.UserHandle; import android.os.PowerManager; import android.os.SystemClock; +import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.util.Log; import android.view.View; -import android.view.WindowManager; import android.view.WindowManager.LayoutParams; import android.view.animation.AnimationUtils; diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java index 7d493ebe407546e9a9594a3d756bddc0ca19657c..437f42e424acf5c39d5cb9fe1f1433fc3121e93f 100644 --- a/src/com/android/settings/IccLockSettings.java +++ b/src/com/android/settings/IccLockSettings.java @@ -25,8 +25,6 @@ import android.os.AsyncResult; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -43,6 +41,10 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; import android.widget.Toast; + +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; diff --git a/src/com/android/settings/LegalSettings.java b/src/com/android/settings/LegalSettings.java index 2bdfa3b23fb9eee55e0bda7aa8d4afde691a60e4..9cb62434498b0f3780b7404cc27b9d314021146c 100644 --- a/src/com/android/settings/LegalSettings.java +++ b/src/com/android/settings/LegalSettings.java @@ -24,11 +24,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index a7da41692fa921f9012404975e35d3b890f82d20..6299217b9431b7f7fb85e4598c9259a9dc38ac8d 100644 --- a/src/com/android/settings/MasterClear.java +++ b/src/com/android/settings/MasterClear.java @@ -38,7 +38,6 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.telephony.euicc.EuiccManager; import android.text.TextUtils; import android.util.Log; @@ -54,6 +53,8 @@ import android.widget.LinearLayout; import android.widget.ScrollView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index a92c8f85c7e18ad9f410531a9438f613f2e0e581..0ea7250736453fc9410d1d523b95b0efbc15593a 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; @@ -37,8 +39,6 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - /** * Confirm and execute a reset of the device to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/PreviewPagerAdapter.java b/src/com/android/settings/PreviewPagerAdapter.java index b98ffcb1a115942227226aa88fd16367d1e5c7f1..8d83cb4e071b1e5a93be990dbf9d0b03b45bc43e 100644 --- a/src/com/android/settings/PreviewPagerAdapter.java +++ b/src/com/android/settings/PreviewPagerAdapter.java @@ -19,7 +19,6 @@ import android.animation.Animator; import android.animation.Animator.AnimatorListener; import android.content.Context; import android.content.res.Configuration; -import androidx.viewpager.widget.PagerAdapter; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,7 +29,8 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; import android.widget.FrameLayout; import android.widget.LinearLayout; -import android.widget.ScrollView; + +import androidx.viewpager.widget.PagerAdapter; /** * A PagerAdapter used by PreviewSeekBarPreferenceFragment that for showing multiple preview screen diff --git a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java index e031edb26c3e07dbbec3fb955d91195894320df0..6cbd619b4e8bba65ef7a149c6eb931ae4431e439 100644 --- a/src/com/android/settings/PreviewSeekBarPreferenceFragment.java +++ b/src/com/android/settings/PreviewSeekBarPreferenceFragment.java @@ -19,8 +19,6 @@ package com.android.settings; import android.content.Context; import android.content.res.Configuration; import android.os.Bundle; -import androidx.viewpager.widget.ViewPager; -import androidx.viewpager.widget.ViewPager.OnPageChangeListener; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; @@ -30,6 +28,9 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; import android.widget.TextView; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; + import com.android.settings.widget.DotsPageIndicator; import com.android.settings.widget.LabeledSeekBar; diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java index 0ae9cb135f983c49a51e6a3fc732f00e80540151..cfb95a44869a6e1f7f418a3b86656e957c832b46 100644 --- a/src/com/android/settings/PrivacySettings.java +++ b/src/com/android/settings/PrivacySettings.java @@ -27,21 +27,17 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import android.provider.SearchIndexableResource; import android.provider.Settings; +import android.util.Log; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settings.search.Indexable; -import com.android.settingslib.RestrictedLockUtils; -import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java index eeb7bfe033fe7b480e5b399665a7e1a2897393cf..804d48b30b7e8bdaf53d90a1426934dc0e3a2b10 100644 --- a/src/com/android/settings/ProgressCategory.java +++ b/src/com/android/settings/ProgressCategory.java @@ -17,11 +17,12 @@ package com.android.settings; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A category with a progress spinner */ diff --git a/src/com/android/settings/ProgressCategoryBase.java b/src/com/android/settings/ProgressCategoryBase.java index 89ded4ba01e28669d276086372cb69c094eb04bc..1b06e07be5d52927a0b2a39d9ecc1e549d617ab7 100644 --- a/src/com/android/settings/ProgressCategoryBase.java +++ b/src/com/android/settings/ProgressCategoryBase.java @@ -17,9 +17,10 @@ package com.android.settings; import android.content.Context; -import androidx.preference.PreferenceCategory; import android.util.AttributeSet; +import androidx.preference.PreferenceCategory; + public abstract class ProgressCategoryBase extends PreferenceCategory { public ProgressCategoryBase(Context context) { super(context); diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 557c39b164896ca120fdffdef098fea212f8771b..ee20c586e9bea6c128cfaf7180faed488b61e8cc 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -21,7 +21,6 @@ import static android.provider.Settings.Global.PREFERRED_NETWORK_MODE; import android.app.Activity; import android.app.AlertDialog; -import android.app.Dialog; import android.app.QueuedWork; import android.content.ComponentName; import android.content.Context; @@ -42,23 +41,23 @@ import android.os.Handler; import android.os.Message; import android.provider.Settings; import android.telephony.CarrierConfigManager; +import android.telephony.CellIdentityCdma; +import android.telephony.CellIdentityGsm; +import android.telephony.CellIdentityLte; +import android.telephony.CellIdentityWcdma; import android.telephony.CellInfo; import android.telephony.CellInfoCdma; import android.telephony.CellInfoGsm; import android.telephony.CellInfoLte; import android.telephony.CellInfoWcdma; -import android.telephony.CellIdentityCdma; -import android.telephony.CellIdentityGsm; -import android.telephony.CellIdentityLte; -import android.telephony.CellIdentityWcdma; import android.telephony.CellLocation; import android.telephony.CellSignalStrengthCdma; import android.telephony.CellSignalStrengthGsm; import android.telephony.CellSignalStrengthLte; import android.telephony.CellSignalStrengthWcdma; -import android.telephony.PreciseCallState; import android.telephony.PhoneStateListener; import android.telephony.PhysicalChannelConfig; +import android.telephony.PreciseCallState; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.SubscriptionManager; @@ -85,16 +84,11 @@ import com.android.ims.ImsConfig; import com.android.ims.ImsException; import com.android.ims.ImsManager; import com.android.internal.telephony.Phone; -import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.PhoneFactory; -import com.android.internal.telephony.RILConstants; -import com.android.internal.telephony.TelephonyProperties; import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; -import java.net.UnknownHostException; -import java.util.ArrayList; import java.util.List; public class RadioInfo extends Activity { diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index 2f35221294f3de8055b4557b5db22d87d45e3f49..fc87efdb62bfe1180015a10af1c989f5dae253f7 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -25,13 +25,14 @@ import android.graphics.BitmapFactory; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.Gravity; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import java.util.Locale; /** diff --git a/src/com/android/settings/RemoteBugreportActivity.java b/src/com/android/settings/RemoteBugreportActivity.java index 0589a24c50b40a966655d1a71b2dc612cf40cd8b..7069175bfcc02a204dd704c461fd3dfc55e85d65 100644 --- a/src/com/android/settings/RemoteBugreportActivity.java +++ b/src/com/android/settings/RemoteBugreportActivity.java @@ -24,9 +24,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.util.Log; -import android.widget.LinearLayout; - -import com.android.settings.R; /** * UI for the remote bugreport dialog. Shows one of 3 possible dialogs: diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java index 99f2df63e0a7a1a64e9cc71c654dc3ddb38ffb14..8ab6dc397ab1d690571da017f6d9d549d0dc310d 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -33,16 +33,16 @@ import android.os.RecoverySystem; import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; -import androidx.annotation.VisibleForTesting; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; diff --git a/src/com/android/settings/RestrictedCheckBox.java b/src/com/android/settings/RestrictedCheckBox.java index 476df29bf045dc3ec5526c8e9220f9bf8e29a360..2d45880076f8ac12b1bb631f7de0c89fb775fe38 100644 --- a/src/com/android/settings/RestrictedCheckBox.java +++ b/src/com/android/settings/RestrictedCheckBox.java @@ -22,8 +22,6 @@ import android.content.Context; import android.graphics.PorterDuff; import android.util.AttributeSet; import android.widget.CheckBox; -import android.widget.RadioButton; -import android.widget.TextView; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java index 4cfb2cf1510191cceec2b913a8bcf40e16ae3bb9..d4315878156df07942a881c14f35a8d31b6e3991 100644 --- a/src/com/android/settings/RestrictedListPreference.java +++ b/src/com/android/settings/RestrictedListPreference.java @@ -16,18 +16,15 @@ package com.android.settings; -import android.app.ActivityManager; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.AlertDialog; import android.app.KeyguardManager; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.os.RemoteException; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreferenceDialogFragment; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -38,15 +35,15 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; -import com.android.settings.Utils; +import androidx.preference.ListPreferenceDialogFragment; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; import java.util.ArrayList; import java.util.List; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class RestrictedListPreference extends CustomListPreference { private final RestrictedPreferenceHelper mHelper; private final List mRestrictedItems = new ArrayList<>(); diff --git a/src/com/android/settings/RestrictedRadioButton.java b/src/com/android/settings/RestrictedRadioButton.java index 6ff66ba50fa2d386458490a9a9ba58dbdbb1f585..7efba4fbaf9346dd22f1e7be6de05aeaf27b4d20 100644 --- a/src/com/android/settings/RestrictedRadioButton.java +++ b/src/com/android/settings/RestrictedRadioButton.java @@ -16,18 +16,16 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.content.Context; import android.graphics.PorterDuff; import android.util.AttributeSet; import android.widget.RadioButton; import android.widget.TextView; -import java.util.List; - import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class RestrictedRadioButton extends RadioButton { private Context mContext; private boolean mDisabledByAdmin; diff --git a/src/com/android/settings/RestrictedSettingsFragment.java b/src/com/android/settings/RestrictedSettingsFragment.java index 3392d8c3bcb74bd25982e7bd74d01a85e6a8d270..68bf4e8d13477a675407fc7cc23aa162e6c495e0 100644 --- a/src/com/android/settings/RestrictedSettingsFragment.java +++ b/src/com/android/settings/RestrictedSettingsFragment.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.Activity; import android.app.AlertDialog; import android.content.BroadcastReceiver; @@ -27,16 +29,15 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.view.View; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - /** * Base class for settings screens that should be pin protected when in restricted mode or * that will display an admin support message in case an admin has disabled the options. diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java index 98f0579d6610a13f7a8b50d899a5fcaa5c9ce9e8..8f9c618d5e894bb096182dc0035c35c7b120274f 100644 --- a/src/com/android/settings/RingtonePreference.java +++ b/src/com/android/settings/RingtonePreference.java @@ -24,11 +24,12 @@ import android.media.RingtoneManager; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings.System; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.util.AttributeSet; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; + /** * A {@link Preference} that allows the user to choose a ringtone from those on the device. * The chosen ringtone's URI will be persisted as a string. diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 7e77047cfbcd8fb44cfeba1e6d0a5f983a054333..abe48d68ed94d3b555a95a599d9a0f4720432f04 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -39,11 +39,6 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.transition.TransitionManager; import android.util.FeatureFlagUtils; @@ -54,6 +49,12 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.Toolbar; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; + import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java index 7272399247f3b46e544d4604020e5b5407fa529a..141d16b95a218e5a6dfc760e2d1aa5da1968a3f2 100644 --- a/src/com/android/settings/SettingsInitialize.java +++ b/src/com/android/settings/SettingsInitialize.java @@ -16,6 +16,11 @@ package com.android.settings; +import static android.content.pm.PackageManager.GET_ACTIVITIES; +import static android.content.pm.PackageManager.GET_META_DATA; +import static android.content.pm.PackageManager.GET_RESOLVED_FILTER; +import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; + import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -27,19 +32,15 @@ import android.content.pm.ShortcutManager; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; -import java.util.ArrayList; -import java.util.List; - -import static android.content.pm.PackageManager.GET_ACTIVITIES; -import static android.content.pm.PackageManager.GET_META_DATA; -import static android.content.pm.PackageManager.GET_RESOLVED_FILTER; -import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS; +import androidx.annotation.VisibleForTesting; import com.android.settings.shortcut.CreateShortcut; +import java.util.ArrayList; +import java.util.List; + /** * Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED} * performs setup steps for a managed profile (disables the launcher icon of the Settings app, diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index c1489b033724db517d097994c727506265fe2395..8399f6420ffdfaad10ccbd57eb2cc2453da6c7c4 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -25,12 +25,13 @@ import android.content.Loader; import android.net.Uri; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.FileProvider; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.FileProvider; + import com.android.settings.users.RestrictedProfileSettings; import com.android.settingslib.license.LicenseHtmlLoader; diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index e5a4892044ff5bb684464daa0f057d07e4ee6bed..70b96c4414b07aae940082bb9fcb82cbcc6f7561 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -26,13 +26,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.XmlRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; @@ -41,6 +34,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.XmlRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.applications.LayoutPreference; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java index ac1db15bdc83d8dac06b4555a10a8187a80ed49f..90f6c21dab73040018937fde13b312337026e1e4 100644 --- a/src/com/android/settings/SetupRedactionInterstitial.java +++ b/src/com/android/settings/SetupRedactionInterstitial.java @@ -20,7 +20,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import android.content.res.Resources; import com.android.settings.notification.RedactionInterstitial; diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java index e449d52813d0dcc0956baf7c076cd2ada0d01832..27cdb691d2bc8cd71d4b238567f5749502692d08 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -18,6 +18,7 @@ package com.android.settings; import android.content.Intent; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import com.android.setupwizardlib.util.WizardManagerHelper; diff --git a/src/com/android/settings/SummaryPreference.java b/src/com/android/settings/SummaryPreference.java index 882302786470c62409ec6df8f2a464d78b294533..ced5cd75621f104e832a38e1249a7b758a20cc30 100644 --- a/src/com/android/settings/SummaryPreference.java +++ b/src/com/android/settings/SummaryPreference.java @@ -15,14 +15,15 @@ package com.android.settings; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * Provides a summary of a setting page in a preference. Such as memory or data usage. */ diff --git a/src/com/android/settings/TestingSettings.java b/src/com/android/settings/TestingSettings.java index b630685cf52e0b79fed774ebe7fb10de7b20fc87..ff58f11ede9377fe120257218cb0ecc926308031 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -18,6 +18,7 @@ package com.android.settings; import android.os.Bundle; import android.os.UserManager; + import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/TestingSettingsBroadcastReceiver.java b/src/com/android/settings/TestingSettingsBroadcastReceiver.java index a66f20899622654bd5825d1226a047cc5ec7a05e..2172cd07d6006f85fc572d31479685bcb4a589f1 100644 --- a/src/com/android/settings/TestingSettingsBroadcastReceiver.java +++ b/src/com/android/settings/TestingSettingsBroadcastReceiver.java @@ -1,11 +1,11 @@ package com.android.settings; +import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import static com.android.internal.telephony.TelephonyIntents.SECRET_CODE_ACTION; - import com.android.settings.Settings.TestingSettingsActivity; diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java index e7dc952309c09f7432b2d7542764c8ab492b6ec1..19f0ab06b28f4f0f088432c587b3639870b19dcc 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -34,8 +34,9 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/TimeoutListPreference.java b/src/com/android/settings/TimeoutListPreference.java index 4b0fd9d04518a6d7205efa8997fe1abee7fd1424..a0e59068f5f5ab11819df9a95acb7cb65d7f6c79 100644 --- a/src/com/android/settings/TimeoutListPreference.java +++ b/src/com/android/settings/TimeoutListPreference.java @@ -16,6 +16,8 @@ package com.android.settings; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.app.AlertDialog; import android.app.Dialog; import android.app.admin.DevicePolicyManager; @@ -28,8 +30,6 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class TimeoutListPreference extends RestrictedListPreference { private EnforcedAdmin mAdmin; private final CharSequence[] mInitialEntries; diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java index 86340be98f632a3559b27e1f03cddd6d9189f27f..ff217f6be9c3ebbde8743050b5b9fb8f006af87d 100644 --- a/src/com/android/settings/TrustedCredentialsSettings.java +++ b/src/com/android/settings/TrustedCredentialsSettings.java @@ -42,9 +42,9 @@ import android.os.UserManager; import android.security.IKeyChainService; import android.security.KeyChain; import android.security.KeyChain.KeyChainConnection; +import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; -import android.util.ArraySet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/com/android/settings/UserCredentialsSettings.java b/src/com/android/settings/UserCredentialsSettings.java index 571a32c41ea078dbc5276e2fa0d57aa61935ff2f..ada3fa52e98ed1e51e3dbb136718d7d5283ace05 100644 --- a/src/com/android/settings/UserCredentialsSettings.java +++ b/src/com/android/settings/UserCredentialsSettings.java @@ -39,7 +39,6 @@ import android.security.KeyChain.KeyChainConnection; import android.security.KeyStore; import android.security.keymaster.KeyCharacteristics; import android.security.keymaster.KeymasterDefs; -import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.util.SparseArray; import android.view.LayoutInflater; @@ -47,11 +46,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import java.security.UnrecoverableKeyException; import java.util.ArrayList; import java.util.EnumSet; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 938f5b7b31641904d7374daf4616c728e0407414..04b7843e928331dd09ff97e5a62dd0aa33de3eb4 100644 --- a/src/com/android/settings/Utils.java +++ b/src/com/android/settings/Utils.java @@ -71,9 +71,6 @@ import android.provider.ContactsContract.Data; import android.provider.ContactsContract.Profile; import android.provider.ContactsContract.RawContacts; import android.provider.Settings; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.telephony.TelephonyManager; import android.text.Spannable; import android.text.SpannableString; @@ -90,6 +87,10 @@ import android.widget.EditText; import android.widget.ListView; import android.widget.TabWidget; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.app.UnlaunchableAppActivity; import com.android.internal.util.ArrayUtils; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index c1c8a64c5088433bf786c37e4613808d60de8558..4890011d2ff0cc07b35b5242ebe2ac3786961884 100644 --- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java +++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java @@ -16,6 +16,8 @@ package com.android.settings.accessibility; +import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; import android.app.AlertDialog; @@ -39,8 +41,6 @@ import com.android.settings.R; import java.util.List; import java.util.Locale; -import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; - /** * Utility class for creating the dialog that asks users for explicit permission to grant * all of the requested capabilities to an accessibility service before the service is enabled diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java index d9479bbd74a32e8a5081db458a2c82e8ddd52c44..88e709a6cc59d966c976612fe8e7e82dddf232ee 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -33,18 +33,19 @@ import android.os.UserHandle; import android.os.Vibrator; import android.provider.SearchIndexableResource; import android.provider.Settings; +import android.text.TextUtils; +import android.util.ArrayMap; +import android.view.KeyCharacterMap; +import android.view.KeyEvent; +import android.view.accessibility.AccessibilityManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.core.content.ContextCompat; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.ArrayMap; -import android.view.KeyCharacterMap; -import android.view.KeyEvent; -import android.view.accessibility.AccessibilityManager; +import androidx.preference.SwitchPreference; import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.content.PackageMonitor; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 3500ba29d5e1e5d4f837c0a951d6f6e37805795a..9ee155f97b7024dbe35b3bb6548f1c0c2a5038fe 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -21,10 +21,11 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.ServiceInfo; import android.os.Bundle; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 37b1018ffe47fdf7e64edf4826e4273e6697001f..598e94cbf0df3d3e0157effdb7d36446f7694b08 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -17,11 +17,12 @@ package com.android.settings.accessibility; import android.os.Bundle; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.view.Menu; import android.view.accessibility.AccessibilityEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.settings.SettingsActivity; import com.android.settings.core.SubSettingLauncher; import com.android.settings.search.actionbar.SearchMenuController; diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index e9321c67b43e5ac303fa6f1151b5706891259f4d..69910bd33da7d3b67404452f5eee178aa988fabf 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -25,11 +25,12 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.accessibility.AccessibilityShortcutController; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index a5e02c5cc57f17c1db8faf514b8c0180a08df05f..33cb95ec3191efd9d1469802cb7503264e5f78db 100644 --- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java +++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java @@ -23,10 +23,6 @@ import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceFrameLayout; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnLayoutChangeListener; @@ -35,6 +31,11 @@ import android.view.ViewGroup.LayoutParams; import android.view.accessibility.CaptioningManager; import android.view.accessibility.CaptioningManager.CaptionStyle; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.SubtitleView; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java index 7a7b7fc645707524c53e12dc1e4767e2a66b2086..e360a9ebce8b7267568b26634c3dc64f9fa911b0 100644 --- a/src/com/android/settings/accessibility/ColorPreference.java +++ b/src/com/android/settings/accessibility/ColorPreference.java @@ -20,13 +20,14 @@ import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java index 53a2dda5b2618a4f4d1e4bedd41231dce804917b..1be281f614b114d5aa342d83fdb1771ac405e740 100644 --- a/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java +++ b/src/com/android/settings/accessibility/DividerAllowedBelowPreference.java @@ -17,9 +17,10 @@ package com.android.settings.accessibility; import android.content.Context; +import android.util.AttributeSet; + import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import android.util.AttributeSet; /* * Preference that always has a divider below. Used for SUW Accessibility Settings Summary text. diff --git a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java index 090c3de1e9a24365b4fe6402b284918daea83a3b..343ebb1407475ae79870c7aa858dbe7cf7060e5e 100644 --- a/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; public class HapticFeedbackIntensityPreferenceController diff --git a/src/com/android/settings/accessibility/LocalePreference.java b/src/com/android/settings/accessibility/LocalePreference.java index 4d3497d73fe8e42014f0cf80bfb304beca662a8c..a3723fd4eab43441bd50e6bb8ef1f353592dd5de 100644 --- a/src/com/android/settings/accessibility/LocalePreference.java +++ b/src/com/android/settings/accessibility/LocalePreference.java @@ -17,9 +17,10 @@ package com.android.settings.accessibility; import android.content.Context; -import androidx.preference.ListPreference; import android.util.AttributeSet; +import androidx.preference.ListPreference; + import com.android.internal.app.LocalePicker; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index 16c354c301853172b44a43ff38d0bb991576b04c..f613c69e1b5d057447c07e7f8b06e98abc04a3cb 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.accessibility; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index ff12e27ff60c10388782e677a928bed2e7780d09..5af5d9305611f339a30db10c005fc90a5a5b9d72 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.accessibility; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java index e6875e479b320e614fb8b39af2e6dbba509922f9..1b20ec63037ee61d6a9ad5047765d58520ed2949 100644 --- a/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/MagnificationPreferenceFragment.java @@ -24,11 +24,12 @@ import android.content.res.Resources; import android.os.Bundle; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java index 362b59cffc77f175d898b3af96c033eff7f4388d..4aff5139233db99c15db56f5913db35f5d44e624 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.accessibility; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; public class NotificationVibrationIntensityPreferenceController diff --git a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java index 5f43c2d346f6c8ee4972074f3c876d9e29b2eb80..6804abcb78a15b98b2a8ad5b53bb037ed38d4132 100644 --- a/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/NotificationVibrationPreferenceFragment.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import android.media.AudioAttributes; import android.os.Vibrator; -import android.os.VibrationEffect; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java index a8a960f7671b41ba41992c266ae49ac06126be05..e3be4a96d2ed2b32de8cf7237e2f8318ceaa62dc 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -16,8 +16,11 @@ package com.android.settings.accessibility; import static android.content.DialogInterface.BUTTON_POSITIVE; -import static com.android.internal.accessibility.AccessibilityShortcutController.COLOR_INVERSION_COMPONENT_NAME; -import static com.android.internal.accessibility.AccessibilityShortcutController.DALTONIZER_COMPONENT_NAME; + +import static com.android.internal.accessibility.AccessibilityShortcutController + .COLOR_INVERSION_COMPONENT_NAME; +import static com.android.internal.accessibility.AccessibilityShortcutController + .DALTONIZER_COMPONENT_NAME; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; @@ -39,8 +42,9 @@ import android.text.TextUtils; import android.view.accessibility.AccessibilityManager; import com.android.internal.accessibility.AccessibilityShortcutController; +import com.android.internal.accessibility.AccessibilityShortcutController + .ToggleableFrameworkFeatureInfo; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.internal.accessibility.AccessibilityShortcutController.ToggleableFrameworkFeatureInfo; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.widget.RadioButtonPickerFragment; diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java index 53f7fb51ccf4741669bb9a1647ec58f379b7f04d..b345e05e9cc5f5b24331371055783d8c51725453 100644 --- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java @@ -26,10 +26,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.ResolveInfo; import android.net.Uri; -import android.os.Binder; import android.os.Bundle; import android.os.Handler; -import android.os.IBinder; import android.os.UserHandle; import android.os.storage.StorageManager; import android.provider.Settings; diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java index 3f0fe0ce3cd260bbf696c7eff79a255fbf7d1163..fb6286279ad3bf08257a1dff540921f91d205c1f 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -19,10 +19,11 @@ package com.android.settings.accessibility; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index a38fd275377506b766c69bfd522779f671fe9795..15714527244480e7219ef35a722af7e377303a1b 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -18,11 +18,12 @@ package com.android.settings.accessibility; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.view.accessibility.AccessibilityManager; import android.widget.Switch; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 94a26b9d5a89870298bd52e790facbfa1ad5d17f..fba5ddb31123258b84889d82246fc7a40fb7e3d4 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -19,9 +19,10 @@ package com.android.settings.accessibility; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.Bundle; +import android.view.View; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.view.View; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java index 8c15e5ba63a21f22259d793fbda53d33a2bddd42..45b9def55e876621b0424681f861dcb0aadd8bcd 100644 --- a/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFontSizePreferenceFragment.java @@ -22,6 +22,7 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.provider.Settings; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.PreviewSeekBarPreferenceFragment; import com.android.settings.R; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java index 3e5af894a80a0391d6ef3ff2e4d7006e64293284..99ed7a1494f98f7cd9dc6d18e542cd1351b91ed2 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java @@ -25,9 +25,6 @@ import android.media.MediaPlayer; import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.view.Display; import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.WindowManager; @@ -36,6 +33,10 @@ import android.widget.RelativeLayout.LayoutParams; import android.widget.Switch; import android.widget.VideoView; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java index 433817286768818ffd02cc656ed6245e2b053edc..48a05694c3a33c73666570601468460ca126eca9 100644 --- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java +++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java @@ -18,7 +18,6 @@ package com.android.settings.accessibility; import android.os.Bundle; -import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard diff --git a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java index 1d2012452a6d61108332919f99ef74d2f837614c..ba08a4313fd53af3f4801152319c688c46d4ff77 100644 --- a/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/TouchVibrationPreferenceFragment.java @@ -15,10 +15,8 @@ */ package com.android.settings.accessibility; -import android.graphics.drawable.Drawable; import android.media.AudioAttributes; import android.os.Vibrator; -import android.os.VibrationEffect; import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java index ef7753513a0b193d513e31dc905ebfe9fc1cd942..d9b1d7935d2505650e72fe8222ea4ffb35c5c1f5 100644 --- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java @@ -23,6 +23,7 @@ import android.os.Handler; import android.os.Looper; import android.os.Vibrator; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java index 99557836aa084ed222fd99d238b50c2434d88983..1101611a84529dcff28fe270df5259434b0d51dc 100644 --- a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java +++ b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import static android.os.Vibrator.VibrationIntensity; -import androidx.annotation.VisibleForTesting; import android.content.Context; import android.database.ContentObserver; import android.graphics.drawable.Drawable; @@ -30,8 +29,8 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.Log; -import com.android.internal.accessibility.AccessibilityShortcutController; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index 241f1f3e043aa6971337756612b059f7f8344cd0..f9b7201ef291c58e7550cdf7e1af9adf01d33a04 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -21,6 +21,7 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java index 78713469c0bea693b7f4f68952df6e6a69591f2a..e9476b39b74ab61e84923ab3270f060d6f5efee1 100644 --- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java +++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java @@ -24,6 +24,7 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java index ad7a4b380e4a9ded9151c2ec9ca3a079aca9bb16..eea311312566238bba07844be03894aa48422890 100644 --- a/src/com/android/settings/accounts/AccountPreference.java +++ b/src/com/android/settings/accounts/AccountPreference.java @@ -19,11 +19,12 @@ package com.android.settings.accounts; import android.accounts.Account; import android.content.Context; import android.graphics.drawable.Drawable; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.widget.ImageView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index fad2f13fafd0ff0559973f61f5e37fcda708aaeb..ece9955945632e8caf3ea8ef5acdba6f8fc00344 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -36,15 +36,16 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/AccountRestrictionHelper.java b/src/com/android/settings/accounts/AccountRestrictionHelper.java index 43c56ba9c49b2c582b8c0174c903d15ba66de18a..5fa83b38ef051e1c1b4659f4c18d81cb6bfaac72 100644 --- a/src/com/android/settings/accounts/AccountRestrictionHelper.java +++ b/src/com/android/settings/accounts/AccountRestrictionHelper.java @@ -17,9 +17,11 @@ package com.android.settings.accounts; import android.annotation.UserIdInt; import android.content.Context; + import com.android.settings.AccessiblePreferenceCategory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; + import java.util.ArrayList; public class AccountRestrictionHelper { diff --git a/src/com/android/settings/accounts/AccountSyncPreferenceController.java b/src/com/android/settings/accounts/AccountSyncPreferenceController.java index a0c30ac9c7ac8c0efc90e2b3ed20dd65f046064e..34d903522c4d6ae7f2e873eb372458c42ae9462c 100644 --- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java +++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.SyncAdapterType; import android.os.Bundle; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java index 11867c2b10e36831db3728c91e24eff655ceed46..5b5cf828c738900e83f80862786ae9af63242b37 100644 --- a/src/com/android/settings/accounts/AccountSyncSettings.java +++ b/src/com/android/settings/accounts/AccountSyncSettings.java @@ -35,7 +35,6 @@ import android.os.Binder; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -47,6 +46,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java index 66f8888ecf772d9621e4bdbb2b37e7276f971b4a..a452f8d5c322f2804a9cde2f00e5ac8f53d4fb6c 100644 --- a/src/com/android/settings/accounts/AccountTypePreference.java +++ b/src/com/android/settings/accounts/AccountTypePreference.java @@ -24,6 +24,7 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index e811388066b5c63da1089c2d6450c406f010195e..e5e40c3b9b641d43438a264a40f85da83cc4901a 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -29,13 +29,14 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; +import android.text.TextUtils; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.Log; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/accounts/ChooseAccountActivity.java b/src/com/android/settings/accounts/ChooseAccountActivity.java index 35f51afa80d0b93e2d07069fc5a6f0e865db36de..a10ea03c048bbd33e59fdc8505e2c99ce3e9c700 100644 --- a/src/com/android/settings/accounts/ChooseAccountActivity.java +++ b/src/com/android/settings/accounts/ChooseAccountActivity.java @@ -33,9 +33,10 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.CharSequences; @@ -47,7 +48,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.widget.FooterPreference; -import com.android.settingslib.widget.FooterPreferenceMixin; import com.google.android.collect.Maps; diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java index 95bc8e7d3cc258fea73314a0f42757e21ec76f69..31e5613541cb59099b31fed8c7635549f34828f6 100644 --- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java +++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java @@ -22,6 +22,7 @@ import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/accounts/ManagedProfileSettings.java b/src/com/android/settings/accounts/ManagedProfileSettings.java index 4227e6dec773ccb4c7cb84d6fa5a5aba39fc95d9..694b8af24e4a01370465c3decd56c5839d48055e 100644 --- a/src/com/android/settings/accounts/ManagedProfileSettings.java +++ b/src/com/android/settings/accounts/ManagedProfileSettings.java @@ -16,6 +16,8 @@ package com.android.settings.accounts; +import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -24,10 +26,11 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -35,8 +38,6 @@ import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; -import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SEARCH; - /** * Setting page for managed profile. * FIXME: It currently assumes there is only one managed profile. diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index ecb849bb8acb3eeca69e8fdc56e6dc4f2f1b886d..fbeb90dcddb750e259072dc53a90ff6a86ea991c 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -31,11 +31,12 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index b65b18381163ce15f424c563dd1577c2169cbd89..9c7f739a68a83e2e6bb9b28508dd2d9c78c95fc5 100644 --- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -19,14 +19,15 @@ package com.android.settings.accounts; import android.accounts.Account; import android.app.ActivityManager; import android.content.Context; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.view.View; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settingslib.widget.AnimatedImageView; diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index dd71087a2a0803454be6df455e9623b83cef1415..8a147c17d2babc6630da1b63c54cc6e02388bae5 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -20,10 +20,11 @@ import static com.android.settings.widget.EntityHeaderController.ActionType; import android.app.Activity; import android.os.Bundle; -import androidx.preference.Preference; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 7d422b1503071ea487533076b675dfcd4bde6223..7d11ff95afa60526b5c17b94365a76a47f3b782e 100644 --- a/src/com/android/settings/applications/AppLaunchSettings.java +++ b/src/com/android/settings/applications/AppLaunchSettings.java @@ -16,6 +16,11 @@ package com.android.settings.applications; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; +import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; + import android.app.AlertDialog; import android.content.Intent; import android.content.IntentFilter; @@ -26,25 +31,21 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.util.ArraySet; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; import java.util.List; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER; -import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED; - public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener, Preference.OnPreferenceChangeListener { private static final String TAG = "AppLaunchSettings"; diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java index f8dd59ce8e50949398424e3cf2e15da30ad20aaa..0e3ee2d81169930abf5daff473a574c26f4cabd7 100755 --- a/src/com/android/settings/applications/AppStateAppOpsBridge.java +++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java @@ -25,11 +25,12 @@ import android.content.pm.PackageManager; import android.os.RemoteException; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.ArrayMap; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/src/com/android/settings/applications/AppStateInstallAppsBridge.java b/src/com/android/settings/applications/AppStateInstallAppsBridge.java index 5b9ded648cfeb1131f86ee21932ea06b24337ff8..f852bcab9a094263f83b856f87c8e3620b2510e7 100644 --- a/src/com/android/settings/applications/AppStateInstallAppsBridge.java +++ b/src/com/android/settings/applications/AppStateInstallAppsBridge.java @@ -25,7 +25,6 @@ import android.os.RemoteException; import android.util.Log; import com.android.internal.util.ArrayUtils; -import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; diff --git a/src/com/android/settings/applications/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java index 6cf64c3e57b0aad8cdcc2c12a81de13e1bcfed44..205c92d091a677dae434d20709b763d88e25caf1 100644 --- a/src/com/android/settings/applications/AppStateNotificationBridge.java +++ b/src/com/android/settings/applications/AppStateNotificationBridge.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import android.app.usage.IUsageStatsManager; import android.app.usage.UsageEvents; -import android.app.usage.UsageStatsManager; import android.content.Context; import android.os.RemoteException; import android.os.UserHandle; diff --git a/src/com/android/settings/applications/AppStateSmsPremBridge.java b/src/com/android/settings/applications/AppStateSmsPremBridge.java index 0fa7e50ff66513822a553aa827917e63254736a8..5a79a62bb9b97463cfc660f2d2219655174a2ba3 100644 --- a/src/com/android/settings/applications/AppStateSmsPremBridge.java +++ b/src/com/android/settings/applications/AppStateSmsPremBridge.java @@ -16,6 +16,7 @@ package com.android.settings.applications; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; + import com.android.internal.telephony.ISms; import com.android.internal.telephony.SmsUsageMonitor; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java index 8289114352747b333c6eded20ce0dc42d63bb78d..f99bcc04860833845382763ce93da30fe507a9f8 100644 --- a/src/com/android/settings/applications/AppStorageSettings.java +++ b/src/com/android/settings/applications/AppStorageSettings.java @@ -19,18 +19,14 @@ package com.android.settings.applications; import static android.content.pm.ApplicationInfo.FLAG_ALLOW_CLEAR_USER_DATA; import static android.content.pm.ApplicationInfo.FLAG_SYSTEM; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS; -import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; - import android.app.ActivityManager; import android.app.AlertDialog; import android.app.AppGlobals; import android.app.GrantedUriPermission; import android.app.LoaderManager; import android.content.ContentResolver; -import android.content.ContentValues; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -47,15 +43,16 @@ import android.os.RemoteException; import android.os.UserHandle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.util.Log; import android.util.MutableInt; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java index 6999a1581e21bfd370bf6c3879f5a4b068a38f22..43734b272c492f1f7a0de5cda71c850a1829f24d 100644 --- a/src/com/android/settings/applications/AppStorageSizesController.java +++ b/src/com/android/settings/applications/AppStorageSizesController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; +import android.text.format.Formatter; + import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.preference.Preference; -import android.text.format.Formatter; import com.android.internal.util.Preconditions; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java index 26eb0844ce685b4b822938070aec2860a29fd447..768fb4ea99c9ee1ef0871e7548b3c030b4711f61 100644 --- a/src/com/android/settings/applications/ClearDefaultsPreference.java +++ b/src/com/android/settings/applications/ClearDefaultsPreference.java @@ -24,9 +24,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.BulletSpan; @@ -36,6 +33,10 @@ import android.view.View; import android.widget.Button; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; diff --git a/src/com/android/settings/applications/ConfirmConvertToFbe.java b/src/com/android/settings/applications/ConfirmConvertToFbe.java index 1a4421e23041c6935cec2bdfceb416f80d7d7042..5570f97144ff397fb39c371c8472ada5ab945313 100644 --- a/src/com/android/settings/applications/ConfirmConvertToFbe.java +++ b/src/com/android/settings/applications/ConfirmConvertToFbe.java @@ -15,7 +15,6 @@ */ package com.android.settings.applications; -import android.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; diff --git a/src/com/android/settings/applications/DataSaverController.java b/src/com/android/settings/applications/DataSaverController.java index afe7cd64cd379140064e0216d06e3a9a708702a1..c2e79bbc6a0cefdc9f5efa4007624e39e629b9ca 100644 --- a/src/com/android/settings/applications/DataSaverController.java +++ b/src/com/android/settings/applications/DataSaverController.java @@ -18,10 +18,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class DataSaverController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/DeviceAdministratorsController.java b/src/com/android/settings/applications/DeviceAdministratorsController.java index ec1d556a611bbedd1d6d139b898370becec76e9c..6b942d6b3a8e0c62a675353f89f464a9b77b4403 100644 --- a/src/com/android/settings/applications/DeviceAdministratorsController.java +++ b/src/com/android/settings/applications/DeviceAdministratorsController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class DeviceAdministratorsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java index 8a8fa98b6523c547b7e04c08803581e084209a52..47c36c296ff26f0c19b9c3148d398745226dd32a 100644 --- a/src/com/android/settings/applications/DirectoryAccessDetails.java +++ b/src/com/android/settings/applications/DirectoryAccessDetails.java @@ -17,16 +17,18 @@ package com.android.settings.applications; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.AUTHORITY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_DIRECTORY; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_GRANTED; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_PACKAGE; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.COL_VOLUME_UUID; import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COLUMNS; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_DIRECTORY; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_GRANTED; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_PACKAGE; -import static android.os.storage.StorageVolume.ScopedAccessProviderContract.TABLE_PERMISSIONS_COL_VOLUME_UUID; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COLUMNS; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_DIRECTORY; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_GRANTED; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_PACKAGE; +import static android.os.storage.StorageVolume.ScopedAccessProviderContract + .TABLE_PERMISSIONS_COL_VOLUME_UUID; import static com.android.settings.applications.AppStateDirectoryAccessBridge.DEBUG; import static com.android.settings.applications.AppStateDirectoryAccessBridge.VERBOSE; @@ -42,21 +44,15 @@ import android.net.Uri; import android.os.Bundle; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroupAdapter; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceCategory; -import android.text.TextUtils; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; -import android.util.ArrayMap; -import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; import android.util.Pair; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.EntityHeaderController; diff --git a/src/com/android/settings/applications/EnabledVrListenersController.java b/src/com/android/settings/applications/EnabledVrListenersController.java index 7b33529d7eb5ffb4f8170eb3e4ff9040486f11e8..901e3da3a777d3f8ac7703e8e6c99bf87d1bf59b 100644 --- a/src/com/android/settings/applications/EnabledVrListenersController.java +++ b/src/com/android/settings/applications/EnabledVrListenersController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class EnabledVrListenersController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/HighPowerAppsController.java b/src/com/android/settings/applications/HighPowerAppsController.java index 39b84516315bc953a5592646450f268ee2b8e0c1..70d610083e4466ffedf3091eaa8833d7af688cee 100644 --- a/src/com/android/settings/applications/HighPowerAppsController.java +++ b/src/com/android/settings/applications/HighPowerAppsController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class HighPowerAppsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/InstalledAppCounter.java b/src/com/android/settings/applications/InstalledAppCounter.java index 26372ee577e468a78f5163ba26662406dc5a3826..54216ce5e7d357065cfcb99dd14e9b83e09c7dc2 100644 --- a/src/com/android/settings/applications/InstalledAppCounter.java +++ b/src/com/android/settings/applications/InstalledAppCounter.java @@ -17,8 +17,8 @@ package com.android.settings.applications; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import android.content.pm.ResolveInfo; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; import android.os.UserHandle; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java index f80100f9d2665bcda8a30ee4a3d44a98aa34d652..cc077cc753936a151cbb98ca81206b24e37316a8 100644 --- a/src/com/android/settings/applications/LayoutPreference.java +++ b/src/com/android/settings/applications/LayoutPreference.java @@ -18,16 +18,17 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ManageDomainUrls.java b/src/com/android/settings/applications/ManageDomainUrls.java index 1b9dbaf64cd498285d3fb8dbba31f44b775f255d..78a7b2d65e63690f7aeaa64bef481ef85ca0c841 100644 --- a/src/com/android/settings/applications/ManageDomainUrls.java +++ b/src/com/android/settings/applications/ManageDomainUrls.java @@ -23,16 +23,17 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.Global; +import android.util.ArraySet; +import android.view.View; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceViewHolder; -import android.util.ArraySet; -import android.view.View; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java index 2210c0b176b6aec7e4feb04f8576d7d201535c21..e9259dbeebba339d26df29f39385399dda686e22 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -18,12 +18,13 @@ import android.annotation.Nullable; import android.app.Application; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; -import android.view.View; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/applications/PremiumSmsController.java b/src/com/android/settings/applications/PremiumSmsController.java index eeb5d86fd908c9381f55183211dbbb87b6a79829..5ac374f7162dbbfa6e9b6e9d5daa30e041e50cac 100644 --- a/src/com/android/settings/applications/PremiumSmsController.java +++ b/src/com/android/settings/applications/PremiumSmsController.java @@ -17,10 +17,11 @@ package com.android.settings.applications; import android.content.Context; + import androidx.annotation.VisibleForTesting; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; public class PremiumSmsController extends BasePreferenceController { diff --git a/src/com/android/settings/applications/ProcStatsPackageEntry.java b/src/com/android/settings/applications/ProcStatsPackageEntry.java index 88d5bd645eb9c6b42763e07d8a4e996598459b07..0c4f9be82b9ee51f6f850ba5dc1d2aaea626d08a 100644 --- a/src/com/android/settings/applications/ProcStatsPackageEntry.java +++ b/src/com/android/settings/applications/ProcStatsPackageEntry.java @@ -21,8 +21,8 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Parcel; import android.os.Parcelable; - import android.util.Log; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index 75609528d8ef96365361bff803c48db6b430c601..dda5063e8b9fddd9eddcdd9432920c9b2af308d2 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -16,6 +16,8 @@ package com.android.settings.applications; +import static com.android.settings.widget.EntityHeaderController.ActionType; + import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; @@ -33,8 +35,6 @@ import android.graphics.drawable.ColorDrawable; import android.os.Bundle; import android.os.Process; import android.os.UserHandle; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.text.format.Formatter; import android.util.ArrayMap; import android.util.IconDrawableFactory; @@ -44,6 +44,9 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CancellablePreference; import com.android.settings.CancellablePreference.OnCancelListener; @@ -59,8 +62,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import static com.android.settings.widget.EntityHeaderController.ActionType; - public class ProcessStatsDetail extends SettingsPreferenceFragment { private static final String TAG = "ProcessStatsDetail"; diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java index 034a68dd69b87362e1a9093dc519354f06d8dfd4..64521984fc7ad729e4f1270ecc67716336587f3e 100644 --- a/src/com/android/settings/applications/ProcessStatsPreference.java +++ b/src/com/android/settings/applications/ProcessStatsPreference.java @@ -20,8 +20,8 @@ import android.content.Context; import android.content.pm.PackageManager; import android.text.TextUtils; import android.text.format.Formatter; - import android.util.Log; + import com.android.settings.widget.AppPreference; public class ProcessStatsPreference extends AppPreference { diff --git a/src/com/android/settings/applications/ProcessStatsSummary.java b/src/com/android/settings/applications/ProcessStatsSummary.java index 72572db83a7f79b6ee4a69b3016756905464cf06..b29b273693663161ba2f4395ce86ead4a24bc0d6 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -18,11 +18,12 @@ package com.android.settings.applications; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 42475d295f88180cbb1f487f1d27250b413742e3..25f9c7eec5bc0766b886762ca26d29dad7d70acb 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -19,14 +19,15 @@ package com.android.settings.applications; import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.Log; import android.util.TimeUtils; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.app.procstats.ProcessStats; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index 92d8af1f096fbf863e7e50faab16141a38d2a94d..628b3b1aa386fb56542b68bf8bd9c2bca0df448e 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -27,16 +27,17 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java index b532896f1009116531af1897bceefba35c424580..6575ad1dfa7454c56d5d109c6122b64afe5a9d8f 100644 --- a/src/com/android/settings/applications/SpacePreference.java +++ b/src/com/android/settings/applications/SpacePreference.java @@ -17,11 +17,13 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; +import android.util.AttributeSet; +import android.view.ViewGroup.LayoutParams; + import androidx.core.content.res.TypedArrayUtils; import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import android.util.AttributeSet; -import android.view.ViewGroup.LayoutParams; + import com.android.settings.R; /** diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 16fb4057e15db0a415156da86c3c6dadd306a68a..81b48056515ba1a18c147ce5b9700b5ed29dc7bd 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -17,15 +17,18 @@ package com.android.settings.applications; import android.app.ActivityManager; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; import android.provider.SearchIndexableResource; + +import androidx.annotation.NonNull; import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java index ef2b2118d3f8ac374b0a6e098d79d56cbffc2409..e5d7deec9dfce5c287f218b7c83c3e3a8837c3f6 100644 --- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java +++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java @@ -14,7 +14,9 @@ package com.android.settings.applications; import android.content.Context; + import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.datausage.DataSaverBackend; diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 1681b1d31695b52799d8fed06d503d0a956b9f1c..1725af8444820d6f81cd57f4e92e187a00060ce6 100644 --- a/src/com/android/settings/applications/UsageAccessDetails.java +++ b/src/com/android/settings/applications/UsageAccessDetails.java @@ -18,27 +18,24 @@ package com.android.settings.applications; import android.app.AlertDialog; import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; -import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStateUsageBridge.UsageState; import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java index 79c22248a690b1965b8b6e3b0b701c3298a15745..8836027ec3befcb749377e4547ad8f6f81a6639b 100644 --- a/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceController.java @@ -33,11 +33,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.webkit.IWebViewUpdateService; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 55a6c9ff4f288b979f640d596f33ea9841e955d7..20eba48c80ca541cd062c286aceb50135ce1e032 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -23,6 +23,7 @@ import android.content.pm.PackageInfo; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index c572c3724efb2b292f3c835d51c5de281a814c69..4e2904eb3e222eeb1d871303980d47a5c539bc1d 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -25,11 +25,12 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; +import android.text.format.DateUtils; +import android.text.format.Formatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.format.DateUtils; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java index e37e6708209c5335d97ddd918b027a019e19516c..c86117503fd0c40c21a6a2c8c4cab79aff58e11e 100644 --- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 7ae4f2bc96b0734f6739b5507d0aabbacdd1448a..f41c991a98c3843b6715994a0385112f57082387 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -39,13 +39,14 @@ import android.os.AsyncTask; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.DeviceAdminAdd; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java index 3fc629d5a574cd1d97ac40506f5dc86d47db513e..c495cbc50c82fa2481f16158b8eeaceca51dd620 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java @@ -18,9 +18,10 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java index 6a1079c7a7424e562718dc012e8a3a0db03b82bf..bf8567684ecf36c3cb4aafe82696781a34a71f24 100644 --- a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.Intent; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java index e5b6eed0f59a0a2069f6261c2aa9827822cfe32a..19e8ebbb29765856ee511adbfc66769b8533a329 100644 --- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java @@ -20,9 +20,10 @@ import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; import android.os.AsyncTask; +import android.text.format.Formatter; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java index d4e7e602b699c2fd12c5a755a27e836ea603d55c..8519893da31e0745585cb36254328a901cbb5d26 100644 --- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java @@ -20,6 +20,7 @@ import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java index 7e61385cb7df3abb648fa46c3eafab37d6374401..7f64e3b48b1a48f85cbfca18037391aa03ee7a51 100644 --- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java @@ -22,6 +22,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.hardware.usb.IUsbManager; import android.os.ServiceManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java index c5eed7b4ecff35e765efa1366694147328699663..3c07254fd2bde75693c001a4b84c4dc5b7b78aeb 100644 --- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.icu.text.ListFormatter; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.R; import com.android.settingslib.applications.PermissionsSummaryHelper; diff --git a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java index 4973ee90bb1eeac504c976a9ef4cf88e69e5d52e..f5ce18e008075d12703250b214eb2291deecb7b5 100644 --- a/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppSettingPreferenceController.java @@ -21,9 +21,10 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.overlay.FeatureFactory; public class AppSettingPreferenceController extends AppInfoPreferenceControllerBase { diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java index 5754dd2030313061ebb633d23d1b36956d716e24..172810cae8c82cdbcfeb2989fd1eb9a5d3456cdf 100644 --- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java @@ -22,9 +22,10 @@ import android.content.Loader; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.os.UserHandle; +import android.text.format.Formatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index 7b45b67de294e21024e0ce6bd62f8068e2e41623..e4e4d2052bd127067e66c15be3e1d5f6c99a2962 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java @@ -17,9 +17,10 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 9efa998727b7b546c93bb739ffbd2a4839133e64..50de6fe06765269a1208c22abe2aff95b56774de 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -19,21 +19,19 @@ import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYST import android.app.AlertDialog; import android.app.AppOpsManager; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; +import android.view.Window; +import android.view.WindowManager; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import android.util.Log; -import android.view.Window; -import android.view.WindowManager; +import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java index df8b86298bee1a15f90b506d7a67ccf75d68d9b1..ec2508f107abd6644e8dc13adbc424a1ca2917bb 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index 0c06e081773c6e9e395c08c3930809ca60a3c0e9..8c83820e36bad20ae300e3a1051ddfeee746c6c5 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -24,6 +24,7 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java index eb5e2ebd92357030536758c0d2a2f866eab5cf04..aa6e3b8da1dd809c19d358c1abc8d7750895e670 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java @@ -25,8 +25,6 @@ import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; @@ -34,6 +32,8 @@ import android.view.MenuItem; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppStoreUtil; diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java index c0ba33f2d0834dd419428294b9c8325099513f5e..cbb805f3554b7cecb593190487359240cf812ef8 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageManager; + import androidx.preference.Preference; import com.android.settings.Utils; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java index 7b98404e17b4307ede1e9ea9bde9d65aaad90a02..584e12cb8a547ff782a5d281f57ef807a22c928d 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java @@ -20,9 +20,10 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.UserHandle; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java index 21b224a96ae3537b5920e1eaaeb58aa7c2e88d1d..7f4faebbedc79f7af5d629220c521e125b5e0881 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java @@ -15,13 +15,18 @@ */ package com.android.settings.applications.appinfo; +import static android.app.AppOpsManager.MODE_ALLOWED; +import static android.app.AppOpsManager.MODE_ERRORED; +import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; + import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -29,10 +34,6 @@ import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.overlay.FeatureFactory; -import static android.app.AppOpsManager.MODE_ALLOWED; -import static android.app.AppOpsManager.MODE_ERRORED; -import static android.app.AppOpsManager.OP_PICTURE_IN_PICTURE; - public class PictureInPictureDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java index 9d7f30a911a4789af1d918377b1c5911fd55526b..419669814dcb96e2bb06477a05540445d13ebd8f 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java @@ -27,13 +27,14 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.util.IconDrawableFactory; import android.util.Pair; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java index 6a390770249bde2de5dc5f10c1e2f4a004268bcd..a4cfebfcb25a9976c760940b3255b52abdc0caf1 100644 --- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java @@ -21,10 +21,11 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index 617154797f94895e89d209c05641b3a1711f2a5e..97763050dbf39b81a0f12e03a339dc815de1bba2 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -17,19 +17,17 @@ package com.android.settings.applications.appinfo; import android.app.AlertDialog; import android.app.AppOpsManager; -import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; -import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.Preference.OnPreferenceClickListener; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java index d9db9aa6c2a65363deac3120a7a6152d72ebf2c5..b347e9306950f64a99a02c20414149129b4fb5f0 100644 --- a/src/com/android/settings/applications/appops/BackgroundCheckSummary.java +++ b/src/com/android/settings/applications/appops/BackgroundCheckSummary.java @@ -25,8 +25,8 @@ import android.view.View; import android.view.ViewGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.R; +import com.android.settings.core.InstrumentedPreferenceFragment; public class BackgroundCheckSummary extends InstrumentedPreferenceFragment { // layout inflater object used to inflate views diff --git a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java index 2ac51e7264aa92724bed9f9f3535358bdc85bc39..3e5c4ec5280cd12dd9869da6499ad858cb5f3503 100644 --- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index ccdacedc5ac0eddb31ca2d815d2a267a77e0e426..a1d0ddc2c88e6187badd6f0d5d672fbf620c6089 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java index 59425f392e226795c7604017bf51971cb44e9be9..59479438c2552047999351350773b1df2f1e3939 100644 --- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java index c5d028ec432a91117479986e8b16ecc1105ae15a..f0da694a3a8c041442af319b9c56853d0f79b0fa 100644 --- a/src/com/android/settings/applications/assist/AssistSettingObserver.java +++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java @@ -20,6 +20,7 @@ import android.content.ContentResolver; import android.database.ContentObserver; import android.net.Uri; import android.provider.Settings; + import androidx.annotation.MainThread; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java index d54e6d1a3fee1f8a8b3f355cddefa62bbd464514..c5a13c5b21c466204244b2e1918327badbb7c2fd 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPicker.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPicker.java @@ -32,7 +32,6 @@ import com.android.internal.app.AssistUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; - import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java index 6f44ff4f70caa9f7bb0b985f092b812b7ee382cc..ccc2162f80827c2f57334b4e73b6fdf0d95ecbd4 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java @@ -23,6 +23,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.service.voice.VoiceInteractionService; import android.service.voice.VoiceInteractionServiceInfo; + import androidx.annotation.VisibleForTesting; import com.android.internal.app.AssistUtils; diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java index 15433676dd1e375eed89d74b84f4ab66f58c1421..1f8b9d1a5ccca7b8c965f4199a98ed0e917e9fb4 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java @@ -20,9 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.app.AssistUtils; import com.android.settings.applications.defaultapps.DefaultAppPreferenceController; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java index ec8111ba90677a257710d6481bdc20d7f5e26e12..8d3d86bacad22c21b1dfdcc30aab4c08c928d72c 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -23,10 +23,11 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java index 7d9989ff1cebcad39183f8b2aae0f68dfb670af1..ffee2f7c411377a4628dd94b8c3b8c8204667ced 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java @@ -30,11 +30,12 @@ import android.os.Bundle; import android.provider.Settings; import android.service.autofill.AutofillService; import android.service.autofill.AutofillServiceInfo; -import androidx.preference.Preference; import android.text.Html; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.content.PackageMonitor; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java index c243970bad09cca6a4c362b68e7da927e96f9f72..a595e3061c82dc5a1e0c63ac5a59ed07cb6a3a9c 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java @@ -17,14 +17,12 @@ package com.android.settings.applications.defaultapps; import android.content.Context; -import android.content.pm.ComponentInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; - import android.util.ArraySet; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; - import com.android.settingslib.applications.DefaultAppInfo; import java.util.ArrayList; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java index 9d72bcf63819076881432a5695891dfed22f2d51..e1fd57b536d771505f986db04aa3af1a558c6730 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java @@ -24,11 +24,12 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.net.Uri; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.preference.Preference; + import com.android.settingslib.applications.DefaultAppInfo; import java.util.List; diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java index b774602aeeb44a352ecb771313775201a0a234c4..55803c50f284d9f1350ede686a7ab4b61f096b4b 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index ff584b57e3294bd8cdccbf0115b7efcd43debf24..2e4a640de4d9a5480526c358e3ccfa1f7a763990 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -19,11 +19,11 @@ package com.android.settings.applications.manageapplications; import androidx.annotation.IntDef; import com.android.settings.R; +import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateInstallAppsBridge; import com.android.settings.applications.AppStateNotificationBridge; import com.android.settings.applications.AppStateOverlayBridge; import com.android.settings.applications.AppStatePowerBridge; -import com.android.settings.applications.AppStateDirectoryAccessBridge; import com.android.settings.applications.AppStateUsageBridge; import com.android.settings.applications.AppStateWriteSettingsBridge; import com.android.settings.wifi.AppStateChangeWifiStateBridge; diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index a1a4c22a4bb1ea00e0ba569a603d9c81a609ec02..021a953db335923bd36ebd3a8ab8d1c03a269ea8 100644 --- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java +++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java @@ -19,9 +19,6 @@ package com.android.settings.applications.manageapplications; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -31,6 +28,10 @@ import android.widget.ImageView; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index b23a9670e6680ece3d9761a618992d11c11e08f7..f1e15cc2bd7a111a0d6ba82599968a203f680325 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; + import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_ALL; import static com.android.settings.applications.manageapplications.AppFilterRegistry @@ -42,7 +43,6 @@ import android.annotation.Nullable; import android.annotation.StringRes; import android.app.Activity; import android.app.usage.IUsageStatsManager; -import android.app.usage.UsageStatsManager; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -53,10 +53,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; import android.preference.PreferenceFrameLayout; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; @@ -72,6 +68,11 @@ import android.widget.ArrayAdapter; import android.widget.FrameLayout; import android.widget.Spinner; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java index 2f33c1e33634227b0d35906bff85cbdb6dffc784..3036657b11a83775d8dab6c3b1a4a4521a1c7973 100644 --- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java @@ -21,10 +21,11 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.DocumentsContract; -import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.Log; +import androidx.annotation.WorkerThread; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java index 6b7c8d6ce07b71a0936205efcc48bcdc9bcb3717..694c95c4726be38acaaf5ae179807e431304a251 100644 --- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java @@ -20,10 +20,11 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.UserHandle; -import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.Log; +import androidx.annotation.WorkerThread; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.applications.StorageStatsSource; diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java index 3fc3c1dbf4d405a91b57f02d9d0f7ec1ea726a8c..6ef45935d4a3c76a912cd672428cd4b556977f12 100644 --- a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java +++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.applications.manageapplications; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index a16ab7839b5be4c1ee14265581a0c5e8b0a8f168..1cc0bddaee7e935edf4308a3327f17df0ef1199f 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -23,11 +23,11 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.Log; -import com.android.settings.R; +import androidx.annotation.VisibleForTesting; +import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index e9bcc6fe9ec53d3ac77198bd1867f9ea4a1f7470..33da8eae72aaf94d0416cf8acd4d0ec6b0baed8e 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -21,7 +21,6 @@ import android.os.Bundle; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/backup/BackupSettingsHelper.java b/src/com/android/settings/backup/BackupSettingsHelper.java index 15f1dab92f36e0062a64fcccee6ace76439e7170..5f8ff9e8f60295b75395192803730b851afbe132 100644 --- a/src/com/android/settings/backup/BackupSettingsHelper.java +++ b/src/com/android/settings/backup/BackupSettingsHelper.java @@ -24,9 +24,10 @@ import android.content.Intent; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Settings.PrivacySettingsActivity; diff --git a/src/com/android/settings/backup/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java index ec0c011585cd777c256a050a7dcd1a3fa0600d40..2a657eabb9fd93b78b7406bccb3583ec9d62d7e2 100644 --- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java +++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.backup; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index d7ff0e6de9e723cb5b562163eb64278e6c835f16..d6dea8bd597b83aae2d57826c1f860a50cc4cf32 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -9,13 +9,14 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.View; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java index 6f74b54b99b6296bcbd85a3aa3aca208f254e06d..20f1f12e256a88fec3535d8dc964af4c2992d3f3 100644 --- a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java +++ b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java @@ -21,15 +21,11 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.os.Handler; + import androidx.annotation.VisibleForTesting; -import android.util.Log; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; -import java.util.Timer; -import java.util.TimerTask; - /** Helper class, intended to be used by an Activity, to keep the local Bluetooth adapter in * discoverable mode indefinitely. By default setting the scan mode to * BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE will time out after some time, but some diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java index 930d9ff7d9e988d3c7e57270a17a4f427eceab3d..084b502a03dcf2eed09e2f79b44e02196bf99122 100644 --- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java @@ -18,14 +18,15 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import androidx.preference.Preference; +import com.android.settingslib.bluetooth.LocalBluetoothManager; /** * Controller to maintain available media Bluetooth devices diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index 20806458cb64955cae61db40bac47a62d38b247b..ede0b834170884fd399879f6f2e4705c2c73a25f 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index 6ea49a6236d9d400e4a535f80c7f7247c5ca3245..c68656c38bfa37df6450cb3a75d31e0155a92aa1 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index dca7e201bd4cc818b820490b59dc6fcb3cdbfe11..f9ecd8e3ee19a08e5371743b0e517df70339b691 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -18,18 +18,18 @@ package com.android.settings.bluetooth; import android.content.Context; import android.graphics.drawable.Drawable; +import android.util.Pair; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.util.Pair; -import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.bluetooth.CachedBluetoothDevice; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.Lifecycle; /** * This class adds a header with device name and status (connected/disconnected, etc.). diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java index 72effe49271ac45cbd7b7b81760da937888dea03..082ea9f05fa07662a67047c327b11ed59211b527 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index 90723540b5c2acf8573b5ad44fac8ba8b2285df3..0285fec08c5a74a6da8e6c9b4a6f660c7216ab47 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -19,13 +19,14 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index 630c2c57c7add65aa9e41ef2a1c113d2538672d5..71231b3b826a51a994daf61402361dc5fbabb2ba 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -21,11 +21,12 @@ import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index 61bed17fe421a11c05cc214bcb1f7bc8b4b4a43d..95466501f1b90a82beb11519e9238018d758534d 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java @@ -21,13 +21,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index 39a14add55432066bbfeb3f25c8477117597483f..e344df083479399fce20cc2048200ba33b89fcbb 100644 --- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java +++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java @@ -16,6 +16,8 @@ package com.android.settings.bluetooth; +import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; + import android.app.AlertDialog; import android.bluetooth.BluetoothDevice; import android.content.Context; @@ -23,14 +25,15 @@ import android.content.DialogInterface; import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.Html; import android.text.TextUtils; import android.util.Pair; import android.util.TypedValue; import android.widget.ImageView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -38,8 +41,6 @@ import com.android.settings.widget.GearPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; - /** * BluetoothDevicePreference is the preference type used to display each remote * Bluetooth device in the Bluetooth Settings screen. diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index 3b07bd3cd209e71a3445b946ac1d4126a7118578..a217b87f5a30da71b10721cc6e6bf81e8dcfc0dd 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.bluetooth; import android.app.Fragment; import android.content.Context; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index 71335c7fe798910e0a843e81d58cb97cac2b625e..65fd15c904b648762e5fbda3921bf84ae48763a0 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -19,9 +19,9 @@ import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java index 189df3a4998632d8a8a38120cc5c397c82cfea6c..0ab45bb2471497a917f424817e8f905d744cc1b5 100755 --- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java @@ -24,9 +24,10 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.os.Handler; import android.os.SystemProperties; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 8ce701748c15591a9c9583523f4126e8b8ce6f82..3f566f0373a4589dca98f9647c27ad3654f17e33 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.bluetooth; -import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java index 85abadeddcc3e8ff99c828556d52fdef69b7aad8..0eb974628876ccf77e2494555a547767f008b404 100644 --- a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java @@ -29,7 +29,6 @@ import android.text.TextWatcher; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; -import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputMethodManager; import android.widget.Button; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java index 5120cc0ff9bd7708f3f99ac90bd811788c43b1e6..ef5648cf56478dd55ae9c8fc38519ed02b474c3e 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java @@ -23,10 +23,12 @@ import android.text.Editable; import android.util.Log; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; + import com.android.settings.R; import com.android.settings.bluetooth.BluetoothPairingDialogFragment.BluetoothPairingDialogListener; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfile; + import java.util.Locale; /** diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index b3f60967c494649f2804fa68f22255f8f5f50f45..23ff044f619dc6923e401a762621acbd80a96770 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -22,9 +22,10 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.Indexable; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java index f1960e8b18af2321c71154de55feca996b59f0ee..813300597e327442287ee57f8fc656b36dc4bce4 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java index 3d8d038ddfadb9bbc2b62bdfe7a6d9d25f81709b..0ce00deb1fdcf479ccb6b594fb11f45fccd55a10 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java index 4d02fd50c3116c0db3a62c00dc2c4a4bacc4c621..7da63428c726448157802c0208f1f697ea0fb305 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java @@ -20,7 +20,6 @@ import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.content.res.Resources; import android.os.PowerManager; import android.os.UserHandle; diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java index 4fedb6d4f32619679bd305e4128fa1fa072f2c26..d93a7989525b5c5df94815e4af84058a4435591c 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingService.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java @@ -17,15 +17,15 @@ package com.android.settings.bluetooth; import android.app.Notification; -import android.app.NotificationManager; import android.app.NotificationChannel; +import android.app.NotificationManager; import android.app.PendingIntent; import android.app.Service; import android.bluetooth.BluetoothDevice; -import android.content.IntentFilter; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.IntentFilter; import android.content.res.Resources; import android.os.IBinder; import android.text.TextUtils; diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java index 21e8fb8c93d00cdce2929bcf6761989e6a42b675..83ddbd3f611555c25e35e692ad88f6353d904c3a 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -23,12 +23,13 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import androidx.preference.Preference; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java index 7a731ec2033b1df76c98cf9edc301901ef8ff6cd..f89b1f410ca7b166d0cc8fd314171db56e11b9d0 100644 --- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java +++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java @@ -26,7 +26,11 @@ import android.content.Intent; import android.content.IntentFilter; import android.net.Uri; import android.provider.SettingsSlicesContract; + import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -37,10 +41,6 @@ import com.android.settings.slices.SliceBroadcastReceiver; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - public class BluetoothSliceBuilder { private static final String TAG = "BluetoothSliceBuilder"; diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index 62fc4eff558b37b239d31dffcb04646b2e4ff7b5..4a5d78fccf02676e4a64483822b5728e087c53ae 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -19,9 +19,10 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.bluetooth.BluetoothCallback; @@ -29,7 +30,6 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import java.util.Collection; import java.util.Set; /** diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java index c22aa5a2ffe56d567a3bc705f6eda601c17733dd..77e00f715b287bb1ead774810763ecf4ff1e5b29 100644 --- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java @@ -19,9 +19,10 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 688fd27e4152211e28f1365e8f8fc901870ed00e..baad9aeb6d8fc20c6b6b5c6bd1c888045dd24797 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -20,12 +20,13 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.os.Bundle; import android.os.SystemProperties; +import android.text.BidiFormatter; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; -import android.text.BidiFormatter; -import android.util.Log; import com.android.settings.R; import com.android.settings.dashboard.RestrictedDashboardFragment; diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 3a6865355ed713c39b43adc343108472fe045897..6c2876db215d2f67d4a5e883498ab005227e7412 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -25,10 +25,11 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index d6cdb239d4abcb40a6ff0c321f6e16d9a36d31ff..6098014f63a8049b34edde4954e43849c63c2f09 100644 --- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java +++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java @@ -23,7 +23,6 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.text.Html; import android.text.TextUtils; import android.util.Log; @@ -35,6 +34,8 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java index 19eb2005f1c3e82cd5a65d16304db0f7b700ad75..2a659013eb686a80019e8988db97a9d21ce32dba 100644 --- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java +++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; -import android.app.QueuedWork; import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; diff --git a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java index 3ba38448e273398d816839de544c96663c4e2041..aaa7b507f715a026f42b1382f3b0ce139b437553 100644 --- a/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java +++ b/src/com/android/settings/bluetooth/RequestPermissionHelperActivity.java @@ -21,18 +21,12 @@ import android.app.admin.DevicePolicyManager; import android.bluetooth.BluetoothAdapter; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.NonNull; -import android.text.TextUtils; import android.util.Log; import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; -import com.android.internal.util.ArrayUtils; -import com.android.internal.util.CharSequences; import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java index 1dfa6472e61077e47161bf4b9874682d17bf9523..a70bc94cb316bd4f4cdc208d91e14447f4029d81 100644 --- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java @@ -18,14 +18,14 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; + import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import androidx.preference.Preference; -import android.util.Log; /** * Maintain and update saved bluetooth devices(bonded but not connected) diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index daaac314fb1284299e3de065b54c8cd21ab8c8f2..f125f6f84768532ab80ec3bde91a079c551e8d8f 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -22,9 +22,10 @@ import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.DialogInterface; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index 9730515343d73f4267f643691a752ed7b17d66ab..3239dd5b32f30b753074f3d9b1b4e30eb5174ec8 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java @@ -21,11 +21,12 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java index b089b4a93509b24493c8a763042a70de5ee73e50..26c3e34555847e965177937b43d4a1e0e9854209 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java @@ -17,7 +17,9 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.nfc.NfcPreferenceController; diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index f94e81a6d4e59c75094caadc28ec8d7f2a932b04..8db49068aa2406cd2cc25d7fce5ca39505a7cb90 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -19,16 +19,18 @@ import static com.android.settingslib.Utils.isAudioModeOngoingCall; import android.content.Context; import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; + +import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothCallback; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index b30aff132943f4c9ad56f91e459bdd4b40dcf8ba..c4c9369eddcd1fb88e6e0bb3fa614886dad6b9a0 100644 --- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java @@ -19,17 +19,14 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothManager; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController; import com.android.settings.bluetooth.BluetoothSwitchPreferenceController; -import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.TogglePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.location.ScanningSettings; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.widget.SwitchBar; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index cf6bd1392c16f17f9ecc2035ac703cb66fc344c7..60dd14b2140b547a7b2a7cec81dda1bb72037867 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -18,13 +18,13 @@ package com.android.settings.connecteddevice; import android.app.Activity; import android.content.Context; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index aa0b6cd54fd355a2465619b198a5c0b7444c1af3..2b8fefadca723f03ed235d9624fac309758dd0db 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -15,8 +15,9 @@ */ package com.android.settings.connecteddevice; -import android.content.pm.PackageManager; import android.content.Context; +import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; @@ -31,9 +32,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.DockUpdaterFeatureProvider; import com.android.settings.overlay.FeatureFactory; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.core.lifecycle.LifecycleObserver; /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java index cafc0a3dc234d2886cd38ad27489673011f99672..3d84348dc5d5df6590f6efe022883b9a6a40527c 100644 --- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java +++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java @@ -22,21 +22,22 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.R; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixin; diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index 195daf372ff97492b7541919ee4fe6210bbcdaff..c1dd6ed127cf5f9fa383ff0821ddc837ffb29235 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.res.Resources; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index 81d612092363d0078d3134ab5bc4f070dc5cc387..23598a0399f35019df363ee6d6adbb3b28a4fbe1 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -17,20 +17,18 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; - import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.utils.ThreadUtils; public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index 4bc9cdd637f398165830a677d50e49ddb58401fb..81390a797c2d896e1fc7ce712debb687e63fb6b5 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java @@ -15,8 +15,9 @@ */ package com.android.settings.connecteddevice; -import android.content.pm.PackageManager; import android.content.Context; +import android.content.pm.PackageManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdater.java b/src/com/android/settings/connecteddevice/dock/DockUpdater.java index 19ee732417986b80f2bb0e14f3a53bdbdd45ad90..7be79ed1503b280d573747db8ee4c46b29f89b9d 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdater.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdater.java @@ -15,8 +15,6 @@ */ package com.android.settings.connecteddevice.dock; -import android.content.Context; - /** * Update the dock devices. It notifies the upper level whether to add/remove the preference * through {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java b/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java index 7cd2d508519865c009553cc3af1021f5b24e4b66..7caaae609eef728fac16ab737c33cbf41f4a91c6 100644 --- a/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java +++ b/src/com/android/settings/connecteddevice/dock/DockUpdaterFeatureProviderImpl.java @@ -3,7 +3,6 @@ package com.android.settings.connecteddevice.dock; import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; -import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.overlay.DockUpdaterFeatureProvider; /** diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java index 90df30880f0df0afc881967c2b0e81a059efe855..be253e1cbc6e89e77202b059547a9d28d0daac67 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java index e030757f4de549d0e4352e68339ac247a8e6db78..f68a4a07f4388f229372fda9dcd44cbaf51bc830 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java +++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java @@ -24,6 +24,7 @@ import android.hardware.usb.UsbPortStatus; import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java index 1b525352d0fc9e59e2220d47a15fb61437d52f5e..1d43371a02cf8c06c5d4863ed73cb9f2da875041 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java +++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java @@ -24,8 +24,8 @@ import android.hardware.usb.UsbPort; import android.hardware.usb.UsbPortStatus; import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnPause; +import com.android.settingslib.core.lifecycle.events.OnResume; /** * Receiver to receive usb update and use {@link UsbConnectionListener} to invoke callback diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java index cb54216649a0d7a55b634cb10c26ed387f637235..e7544e3a04ddd4429e709a1b8166544f69e33257 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Handler; + import androidx.annotation.UiThread; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index 2e336e48960faddec40640f7a9d0cf26564f4ca9..84576b14252f464f4a72aa82c573e68b8861e4be 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -18,6 +18,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index d93df8066dd89ff97b1961821af4525e4e3e8e71..b54847700cebcbace4f0a08c82f27fe7988c7cc9 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -19,6 +19,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index 8ae334c3a8fe01838f3785aba73978f73b6732bf..e30237dd37b49eb5e499b3760e4cdf1f7a14ae02 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -19,6 +19,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java index c569e1f9bd2efd48320e24fb5f4633ff9a198843..0e1811d70edc4fcd5b77dc9f8e9c09c19e021bff 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java index ae21601e780ad3ff650db42484d4df5b576b56d9..30314f6e2caf1f11709e52cf6de72dc4560e8a54 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java @@ -18,11 +18,12 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/core/BasePreferenceController.java b/src/com/android/settings/core/BasePreferenceController.java index 64b24772035440cfcfa94fa912b217c8f43ea1f4..3c5271845943ef54bc518728499314c7b7f39697 100644 --- a/src/com/android/settings/core/BasePreferenceController.java +++ b/src/com/android/settings/core/BasePreferenceController.java @@ -19,6 +19,9 @@ import android.content.IntentFilter; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; import com.android.settings.slices.SliceData; @@ -30,10 +33,6 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - /** * Abstract class to consolidate utility between preference controllers and act as an interface * for Slices. The abstract classes that inherit from this class will act as the direct interfaces diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 3a3c3d9e19009d1a7dbe8c2cc967bf4264f17f84..12584e2f999d771a5004b1b823228308d1205b8e 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -18,11 +18,12 @@ package com.android.settings.core; import android.content.Context; import android.os.Bundle; -import androidx.annotation.XmlRes; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.XmlRes; +import androidx.preference.PreferenceScreen; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.survey.SurveyMixin; import com.android.settingslib.core.instrumentation.Instrumentable; diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java index a0534ab48ce4a94ae384a208f2bef637d508745d..96399f68b5f0ce5cc3fc9253d5c7090b23c4775f 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -23,14 +23,15 @@ import android.content.Context; import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.Bundle; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; import android.util.Xml; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import org.xmlpull.v1.XmlPullParser; diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java index 65c71eb4219361cb7d4f81604e449ee3d3188c9a..0ea6be3073808b21d7cd4538ef725e9993bd3d69 100644 --- a/src/com/android/settings/core/SliderPreferenceController.java +++ b/src/com/android/settings/core/SliderPreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.core; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.slices.SliceData; diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index 88fbb701d614cc505703c60dc3e7f6356f6fd645..2dd059f387f387ef3b1bc26c6e6dc0b6fac6caa6 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -22,9 +22,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index 3a199b896500cd7d878f2ab3f968cf652f67beb9..165d7eb13058376b9c591aed5397fd3012eb50de 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.core; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index a8cb61cd848fb823fa5f55eaadf73a955a2a7d07..17a295c7a600bf7f0c2405bb09c1f2b473834881 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -79,9 +79,9 @@ import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; +import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; import com.android.settings.inputmethod.KeyboardLayoutPickerFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; @@ -106,10 +106,8 @@ import com.android.settings.notification.NotificationStation; import com.android.settings.notification.SoundSettings; import com.android.settings.notification.ZenAccessSettings; import com.android.settings.notification.ZenModeAutomationSettings; -import com.android.settings.notification.ZenModeMsgEventReminderSettings; import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeEventRuleSettings; -import com.android.settings.notification.ZenModeRestrictNotificationsSettings; import com.android.settings.notification.ZenModeScheduleRuleSettings; import com.android.settings.notification.ZenModeSettings; import com.android.settings.password.ChooseLockPassword; diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 27b45252683465327cfdbe73253ee55822e2bc38..5ce7f352b36f81484e6783c9d07155d0bfed9ae6 100644 --- a/src/com/android/settings/dashboard/DashboardAdapter.java +++ b/src/com/android/settings/dashboard/DashboardAdapter.java @@ -21,10 +21,6 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.DiffUtil; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -34,6 +30,11 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.R.id; diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java index 2ef4abe84b12bf8d8ff9371ef24b6bde23faab06..f324cd4907dc253f940f339935922fabbcabdf40 100644 --- a/src/com/android/settings/dashboard/DashboardData.java +++ b/src/com/android/settings/dashboard/DashboardData.java @@ -18,9 +18,10 @@ package com.android.settings.dashboard; import android.annotation.IntDef; import android.graphics.drawable.Drawable; import android.service.settings.suggestions.Suggestion; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.DiffUtil; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.dashboard.conditional.Condition; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java index b1f66ae4792c1528bf310b4cdd7c22371f323968..2a25c24d936503c76892fe6a374f77928e047b4b 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import android.app.Activity; import android.content.Context; + import androidx.preference.Preference; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index c98c982013d0d3f8092520e596f72aa5a4e5e64b..397b2bfd4db12c859a058500d422cd0a80ff53f0 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -29,13 +29,14 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Icon; import android.os.Bundle; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.ArrayMap; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index bef66c3650ad38b799bc5a9cfb455a90710db048..4cb9c8db3a48efd92eb521a26e911898ebae1366 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -19,15 +19,16 @@ import android.app.Activity; import android.content.Context; import android.content.res.TypedArray; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; diff --git a/src/com/android/settings/dashboard/DashboardItemAnimator.java b/src/com/android/settings/dashboard/DashboardItemAnimator.java index 73224ab2358fb4d6c375cc2e87daf3dcad7dbbcc..51dd49eea3e83f44d6dec76b0429fa3dd5ed3cd6 100644 --- a/src/com/android/settings/dashboard/DashboardItemAnimator.java +++ b/src/com/android/settings/dashboard/DashboardItemAnimator.java @@ -18,6 +18,7 @@ package com.android.settings.dashboard; import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.RecyclerView.ViewHolder; + import com.android.settingslib.drawer.Tile; public class DashboardItemAnimator extends DefaultItemAnimator { diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index e680afdfab3548429e30b6c58ad2b47a19f5f3fa..94b4e0d45e32f6cf06350ff9597af489a34b7cc5 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -22,14 +22,15 @@ import android.content.Context; import android.os.Bundle; import android.os.Handler; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.LinearLayoutManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.LinearLayoutManager; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java index 7b532752866c849b0f153549de1de3957274d40e..fc26e5521cd7b372c60d33d3c05cefb13616d540 100644 --- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java +++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java index de0b39667de5d8868031551bc69fdde72ec972a8..8258678791ae1d847b37690348ec0c801cef83cd 100644 --- a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java +++ b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java @@ -32,9 +32,9 @@ import android.os.UserManager; import android.view.View; import android.widget.TextView; -import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.R; import com.android.settings.RestrictedSettingsFragment; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; /** diff --git a/src/com/android/settings/dashboard/RoundedHomepageIcon.java b/src/com/android/settings/dashboard/RoundedHomepageIcon.java index 77acaf3ec127f5a11541af845520943017eae254..c88619d6d5421b83f93f4a48b546e38672011a82 100644 --- a/src/com/android/settings/dashboard/RoundedHomepageIcon.java +++ b/src/com/android/settings/dashboard/RoundedHomepageIcon.java @@ -22,6 +22,7 @@ import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; + import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/dashboard/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java index a97113147ed5cecc3ee06598000a24110ae90a7c..eddad452d3cbceacd8162dd4a1bcca872771c146 100644 --- a/src/com/android/settings/dashboard/SummaryLoader.java +++ b/src/com/android/settings/dashboard/SummaryLoader.java @@ -25,12 +25,13 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.os.Process; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SettingsActivity; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.drawer.DashboardCategory; diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java index fdd1508db816aef59736f0b294df40ceb4ed6f9f..94d89a9dfda771da872a0bde2b75c5d89b5da129 100644 --- a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java +++ b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java @@ -22,7 +22,6 @@ import android.os.PowerManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; -import com.android.settings.fuelgauge.BatterySaverDrawable; import com.android.settings.fuelgauge.BatterySaverReceiver; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settingslib.fuelgauge.BatterySaverUtils; diff --git a/src/com/android/settings/dashboard/conditional/Condition.java b/src/com/android/settings/dashboard/conditional/Condition.java index f3a3b9c05a58f3b398ddb56bcc266ebca99165e6..bfefe3bed743ff53c1cefbe23b190e6de7de7ecd 100644 --- a/src/com/android/settings/dashboard/conditional/Condition.java +++ b/src/com/android/settings/dashboard/conditional/Condition.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.IntentFilter; import android.graphics.drawable.Drawable; import android.os.PersistableBundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java index 923f1241a531c71f4627388750b5ab3d992f1aff..4c4463105d62265b741084eb23f7323b65cebbbc 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java +++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java @@ -16,15 +16,16 @@ package com.android.settings.dashboard.conditional; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java index 6bcc67e60b80fe6b88f2228a82595d3db10c8f9c..2854ebb26730684b42a9cd45e013e63aa69d978b 100644 --- a/src/com/android/settings/dashboard/conditional/DndCondition.java +++ b/src/com/android/settings/dashboard/conditional/DndCondition.java @@ -25,6 +25,7 @@ import android.os.PersistableBundle; import android.provider.Settings; import android.provider.Settings.Global; import android.service.notification.ZenModeConfig; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java index fc44d0de3ffdf09bd5589070ca64bdc4aa19e265..abe4743cb3e558081d0a3b30d1249b5b9aac516e 100644 --- a/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java +++ b/src/com/android/settings/dashboard/conditional/FocusRecyclerView.java @@ -16,9 +16,10 @@ package com.android.settings.dashboard.conditional; import android.content.Context; +import android.util.AttributeSet; + import androidx.annotation.Nullable; import androidx.recyclerview.widget.RecyclerView; -import android.util.AttributeSet; /** * Version of RecyclerView that can have listeners for onWindowFocusChanged. diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java index 4a3bc334645f5987dc5fc349d27748fb46a23c55..6ddb974291ec70e28e526886ae7692f01d26222d 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java @@ -23,8 +23,6 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; @@ -32,9 +30,11 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.widget.ImageView; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter.DashboardItemHolder; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java index ef3513c4d42784065f33db6b09b358be8f88a1d4..f40f2b772d1f76634c2a8baa7a4e5ddbf807bfa8 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java @@ -20,9 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.NonNull; import android.util.Pair; +import androidx.annotation.NonNull; + import com.android.settingslib.drawer.Tile; import com.android.settingslib.suggestions.SuggestionControllerMixin; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 6ff7ef3795dd768984151416c3bff8ce936ee817..20a9aeaa25ab8ab9bfe7fe3adff85aefaaf2ee67 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -21,10 +21,11 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.NonNull; import android.util.Log; import android.util.Pair; +import androidx.annotation.NonNull; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.Settings.NightDisplaySuggestionActivity; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java index 1474f83e55a8edf1517912c0109d600d98a6480c..8547db0ff03912c8518c352340c8a321a9624c31 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java @@ -25,9 +25,10 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.overlay.FeatureFactory; public class SuggestionStateProvider extends ContentProvider { diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 79adfdab3529ec7550ed715e3a253190d51c2218..7a422368b5648346419a37393a69145c46893074 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -32,15 +32,16 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; import android.widget.AdapterView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index 7595eb56a489873c54834a6a20893a6f2c06ce97..0eab5ab936bb7f63b12be39709af1752e25b8794 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -15,10 +15,11 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.widget.AppPreference; import com.android.settingslib.AppItem; import com.android.settingslib.net.UidDetail; diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java index 690ac2dbfcfb3515ae79205951999302d4e0173f..9df741abd5d325c5927ac5a2cad35689978cc293 100644 --- a/src/com/android/settings/datausage/AppPrefLoader.java +++ b/src/com/android/settings/datausage/AppPrefLoader.java @@ -19,8 +19,10 @@ package com.android.settings.datausage; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import androidx.preference.Preference; import android.util.ArraySet; + +import androidx.preference.Preference; + import com.android.settingslib.utils.AsyncLoader; public class AppPrefLoader extends AsyncLoader> { diff --git a/src/com/android/settings/datausage/BillingCyclePreference.java b/src/com/android/settings/datausage/BillingCyclePreference.java index 9ed6ea7df0eab73d62fbd02aa25c069f7fb05a0f..d92e4f6b866af8a6a4714814de96829f57bebdf9 100644 --- a/src/com/android/settings/datausage/BillingCyclePreference.java +++ b/src/com/android/settings/datausage/BillingCyclePreference.java @@ -21,13 +21,13 @@ import android.content.Intent; import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; -import androidx.preference.Preference; import android.util.AttributeSet; import android.util.FeatureFlagUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; - import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.datausage.CellDataPreference.DataStateListener; diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java index 5cdf22a8970e23bbd054da3f7a97586a4a05fdc2..de74f550aae99d3d88cfd58a44ef4ccc48255ea1 100644 --- a/src/com/android/settings/datausage/BillingCycleSettings.java +++ b/src/com/android/settings/datausage/BillingCycleSettings.java @@ -27,8 +27,6 @@ import android.content.res.Resources; import android.net.NetworkPolicy; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.format.Time; import android.util.FeatureFlagUtils; import android.util.Log; @@ -38,6 +36,9 @@ import android.widget.EditText; import android.widget.NumberPicker; import android.widget.Spinner; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index fb97cd89320eb0de4dd0d7c886072be11d9f90a0..a580873741799427029e88ee76cfd2dc2e85017c 100644 --- a/src/com/android/settings/datausage/CellDataPreference.java +++ b/src/com/android/settings/datausage/CellDataPreference.java @@ -25,9 +25,6 @@ import android.os.Looper; import android.os.Parcel; import android.os.Parcelable; import android.provider.Settings.Global; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -36,6 +33,10 @@ import android.util.Log; import android.view.View; import android.widget.Checkable; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/datausage/ChartDataUsagePreference.java b/src/com/android/settings/datausage/ChartDataUsagePreference.java index 2a58840ed88171ad38603e88a781fb119615314e..a9bcf3b5aa8d508508e4de1ef38df9c086b116d6 100644 --- a/src/com/android/settings/datausage/ChartDataUsagePreference.java +++ b/src/com/android/settings/datausage/ChartDataUsagePreference.java @@ -18,9 +18,6 @@ import android.content.Context; import android.net.NetworkPolicy; import android.net.NetworkStatsHistory; import android.net.TrafficStats; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.format.Formatter; @@ -28,6 +25,10 @@ import android.text.style.ForegroundColorSpan; import android.util.AttributeSet; import android.util.SparseIntArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java index 3e29896a38362da10097ee3ece5a985f4a05eb8a..79e4c130a0a75ef0d1228bdc973dabcd01df9162 100644 --- a/src/com/android/settings/datausage/DataSaverPreference.java +++ b/src/com/android/settings/datausage/DataSaverPreference.java @@ -15,8 +15,10 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.Preference; import android.util.AttributeSet; + +import androidx.preference.Preference; + import com.android.settings.R; public class DataSaverPreference extends Preference implements DataSaverBackend.Listener { diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 47887b3d4937f6705d67254d0a774a3db090a9f1..0be579c11c3274dbe1f8592ff1df8832570ddefe 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -16,9 +16,10 @@ package com.android.settings.datausage; import android.app.Application; import android.os.Bundle; -import androidx.preference.Preference; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/datausage/DataUsageBase.java b/src/com/android/settings/datausage/DataUsageBase.java index b889a2f5812681c08922de0d962e6768f2433508..5939048f7b0efa5032c23b891af92aa2015642a3 100644 --- a/src/com/android/settings/datausage/DataUsageBase.java +++ b/src/com/android/settings/datausage/DataUsageBase.java @@ -33,6 +33,7 @@ import android.os.UserManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; + import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/DataUsageBaseFragment.java b/src/com/android/settings/datausage/DataUsageBaseFragment.java index e9c73ff8cc3269dc1100a2b356a37d6374da114c..512b358d6828f79ae8fd0a28f0e70f68dc603acc 100644 --- a/src/com/android/settings/datausage/DataUsageBaseFragment.java +++ b/src/com/android/settings/datausage/DataUsageBaseFragment.java @@ -34,7 +34,6 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; -import com.android.settings.SettingsPreferenceFragment; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.NetworkPolicyEditor; diff --git a/src/com/android/settings/datausage/DataUsageEditController.java b/src/com/android/settings/datausage/DataUsageEditController.java index adc0fe7dd01951b4427975323270c2ff4ef713a1..edc30b1d4c421d81f1ac0dbb4f4baeacace1658d 100644 --- a/src/com/android/settings/datausage/DataUsageEditController.java +++ b/src/com/android/settings/datausage/DataUsageEditController.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; import android.net.NetworkTemplate; + import com.android.settingslib.NetworkPolicyEditor; /** diff --git a/src/com/android/settings/datausage/DataUsageInfoController.java b/src/com/android/settings/datausage/DataUsageInfoController.java index 115e45e50a2e803d2fc492b721355150e776a309..a471c39a7360e22d32e2a9d1a7a514ad0419f251 100644 --- a/src/com/android/settings/datausage/DataUsageInfoController.java +++ b/src/com/android/settings/datausage/DataUsageInfoController.java @@ -15,6 +15,7 @@ package com.android.settings.datausage; import android.net.NetworkPolicy; + import com.android.settingslib.net.DataUsageController.DataUsageInfo; /** diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 2ab75ee02680a14681a73d246f2f893c55c39ded..7be55f5dbe714b3ff0ebab8541fe40a6f21a2217 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -41,9 +41,6 @@ import android.os.SystemProperties; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -55,6 +52,10 @@ import android.widget.AdapterView; import android.widget.AdapterView.OnItemSelectedListener; import android.widget.Spinner; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index 9e6684c36848b8f39f3e5fa6e0408669252e3700..f0deb49b5f9a16d66e23613438eb3f8c8ee0d95c 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -19,11 +19,12 @@ import android.content.Intent; import android.content.res.TypedArray; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; import android.util.AttributeSet; import android.util.FeatureFlagUtils; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.FeatureFlags; diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index b6e72dd83d694e54eaa774475bc73f48543026d2..71fb5ca42f1f04347eb07e5a8d6bad6ee89a83bd 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -21,9 +21,6 @@ import android.content.Intent; import android.net.NetworkTemplate; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; @@ -35,6 +32,10 @@ import android.text.format.Formatter; import android.text.style.RelativeSizeSpan; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java index 1818b305e33d4459964331b1cd173d966cd69dbd..7ce968ad7c3658b06e4c4db960dc53822b428995 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java +++ b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java @@ -23,9 +23,6 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.text.BidiFormatter; @@ -38,6 +35,10 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SummaryPreference; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index b687127ca6a00b32d0f5daddf9c2c2303c525339..3a357a1da2df150885860d4285ac831cc16e4807 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java @@ -22,8 +22,6 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; @@ -35,6 +33,9 @@ import android.widget.Button; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index e973e6126f238636a7b33140f9ef7615c4585012..6338798b27c1ac3924fbf563c984cb7023976557 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java +++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java @@ -21,9 +21,6 @@ import android.content.Context; import android.content.Intent; import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.SubscriptionPlan; @@ -31,6 +28,10 @@ import android.text.TextUtils; import android.util.Log; import android.util.RecurrenceRule; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.util.CollectionUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/datausage/NetworkRestrictionsPreference.java b/src/com/android/settings/datausage/NetworkRestrictionsPreference.java index e4c6beddcca18c7865ec79178c4900fae445db59..9afc0c32ab68265095959f871c7b6553f52f419c 100644 --- a/src/com/android/settings/datausage/NetworkRestrictionsPreference.java +++ b/src/com/android/settings/datausage/NetworkRestrictionsPreference.java @@ -16,9 +16,10 @@ package com.android.settings.datausage; import android.content.Context; import android.net.NetworkTemplate; -import androidx.preference.Preference; import android.util.AttributeSet; +import androidx.preference.Preference; + public class NetworkRestrictionsPreference extends Preference implements TemplatePreference { public NetworkRestrictionsPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java index c0355b14456740cfbb7aca665a9b747a3317a79e..867930baa971406e06f64dc9244f1f7e82d4cad7 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -15,12 +15,14 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.AdapterView; import android.widget.Spinner; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface { diff --git a/src/com/android/settings/datausage/TemplatePreference.java b/src/com/android/settings/datausage/TemplatePreference.java index 4b1cd0cf828a61e397e61c761920e1d3a9293b65..158c3b67c2e39a1b9f9721d9301055681a1fdd8e 100644 --- a/src/com/android/settings/datausage/TemplatePreference.java +++ b/src/com/android/settings/datausage/TemplatePreference.java @@ -19,9 +19,9 @@ import android.net.NetworkPolicyManager; import android.net.NetworkTemplate; import android.os.INetworkManagementService; import android.os.UserManager; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; + import com.android.settingslib.NetworkPolicyEditor; public interface TemplatePreference { diff --git a/src/com/android/settings/datausage/TemplatePreferenceCategory.java b/src/com/android/settings/datausage/TemplatePreferenceCategory.java index 814a2595472345560929f9957c56daf94e966859..d26b9b18ae057d20e8de8657deb1129601ee9ea2 100644 --- a/src/com/android/settings/datausage/TemplatePreferenceCategory.java +++ b/src/com/android/settings/datausage/TemplatePreferenceCategory.java @@ -16,9 +16,10 @@ package com.android.settings.datausage; import android.content.Context; import android.net.NetworkTemplate; +import android.util.AttributeSet; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import android.util.AttributeSet; public class TemplatePreferenceCategory extends PreferenceCategory implements TemplatePreference { diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccess.java b/src/com/android/settings/datausage/UnrestrictedDataAccess.java index 7aa716c491b2c89e66034bc6b1464c1a90320e29..b6d1a30f845a681ae00c97a1c591a1f0c28e791e 100644 --- a/src/com/android/settings/datausage/UnrestrictedDataAccess.java +++ b/src/com/android/settings/datausage/UnrestrictedDataAccess.java @@ -20,13 +20,14 @@ import android.app.Application; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java index 42ea41a905a842bbd69d485e167a3711dd751ccd..7b7e0640666713dbcb03c88b491689a53a14984c 100644 --- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java @@ -19,13 +19,16 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import android.text.TextUtils; import android.text.format.DateFormat; + +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; + import java.util.Locale; public class AutoTimeFormatPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index 22c01ec78099be8455d16d1c00644fe561b38f21..3916ef27316cea9e46a37c66ad6dc582d387ffaa 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index f9a4821fa8a9921d975aa9082c3f468ef329706b..4426bde99f4a6d39cc3f2befd69700b86056d87a 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/datetime/DatePreferenceController.java b/src/com/android/settings/datetime/DatePreferenceController.java index 856722ca460c5404b06b3f2fadd5db9798d8562d..1704bd6febdde10e446f8c4edd1fffeda36340a1 100644 --- a/src/com/android/settings/datetime/DatePreferenceController.java +++ b/src/com/android/settings/datetime/DatePreferenceController.java @@ -20,12 +20,13 @@ import android.app.Activity; import android.app.AlarmManager; import android.app.DatePickerDialog; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.DatePicker; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 2be6b80afc663ccdcc36d565d9ffaff72869c907..3ad879a279a3c14104046e6d12b7d186259ed2cb 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -19,12 +19,13 @@ package com.android.settings.datetime; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import android.text.TextUtils; import android.text.format.DateFormat; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 58173711a90f7d6abee215aa3802e0f7406c6588..3ca26bc8a748c45bb991ff006aeeca0d3eb040f1 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -20,11 +20,12 @@ import android.app.Activity; import android.app.AlarmManager; import android.app.TimePickerDialog; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateFormat; import android.widget.TimePicker; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index 743cb33c73b9fc1492f32624564ccbfdc14b513e..99b76f6e9b77065e9293c7809b2c245579dda31a 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.datetime; import android.content.Context; +import android.util.FeatureFlagUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/datetime/ZonePicker.java b/src/com/android/settings/datetime/ZonePicker.java index 559a8b3b41727e81d20c3f21bc5957ae8cea1406..5bcc2a9b3a7d502b744574b93273a99c6849fb8c 100644 --- a/src/com/android/settings/datetime/ZonePicker.java +++ b/src/com/android/settings/datetime/ZonePicker.java @@ -22,7 +22,6 @@ import android.app.AlarmManager; import android.app.ListFragment; import android.content.Context; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -33,6 +32,8 @@ import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java index 1a868b8f296f14db65d07784ea591c30e1612a1b..dd8481de3622d551e4970fc4fdd9ad2cb7d4ab2d 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java @@ -17,11 +17,6 @@ package com.android.settings.datetime.timezone; import android.icu.text.BreakIterator; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -29,6 +24,12 @@ import android.view.ViewGroup; import android.widget.Filter; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java index 83b85c0704599d92e21ff10b3ef71977e6d6b47d..1ed851674ea3869b0df6f91227ed1d24c7c08da2 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java @@ -23,6 +23,7 @@ import android.content.res.Resources; import android.icu.text.DateFormat; import android.icu.text.SimpleDateFormat; import android.icu.util.Calendar; + import androidx.annotation.Nullable; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java index 6d93ac91de24dabaa4710c1c9015396807fdbe89..887b9f2af99517fb457f786123b59849b3e2628a 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java @@ -17,9 +17,6 @@ package com.android.settings.datetime.timezone; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -30,7 +27,9 @@ import android.widget.LinearLayout; import android.widget.SearchView; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.datetime.timezone.model.TimeZoneData; diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java index 3e731f62715b469cefbdb157db2d3791afaac562..8a0d73708ca6ee3bbe5cae02bd6bf6f7ea18f48e 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/datetime/timezone/RegionPreferenceController.java b/src/com/android/settings/datetime/timezone/RegionPreferenceController.java index efb3e4def7af61942bb58dae26c56cb57cdfc6aa..53959a69514ed2b718fec325076bed038528b5eb 100644 --- a/src/com/android/settings/datetime/timezone/RegionPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone; import android.content.Context; import android.icu.text.LocaleDisplayNames; -import androidx.preference.Preference; import java.util.Locale; diff --git a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java index e660c330648f2d22505e158f91b552ce6334c739..0abf4e49a54d18e3a7ad6be491e6677c466b3540 100644 --- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java +++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java @@ -21,9 +21,10 @@ import android.content.Intent; import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java index 7a3378acb5e6273239dd3e003dcfea1e2f849b2b..83d71f1c8d246b4c332e1da8867ba4d7bae7f4a5 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java @@ -21,9 +21,10 @@ import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.icu.util.TimeZone; import android.os.Bundle; +import android.util.Log; + import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; -import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java index 79539c3577259c55f57200aed3478707f920c15b..a297ce6085168f67603dc39391dd6910dfdcca25 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java index c64726fbae4eb7398583258f40f8c3c72b697582..233111aa2f19bcb97c63f745ab5e06245110fcd5 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java @@ -24,6 +24,7 @@ import android.icu.text.SimpleDateFormat; import android.icu.util.Calendar; import android.icu.util.TimeZone; import android.icu.util.TimeZoneTransition; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index 354889965844b435b006a0ec04211c0003291427..a20cdb5d41e9a6d0aa99125419edea583a5cd8ef 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -23,13 +23,14 @@ import android.content.Intent; import android.content.SharedPreferences; import android.icu.util.TimeZone; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceCategory; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java index f7d46d1c433c5b443bbe451957ce24e7aa2d60da..1f6fb6b24c73691bc2b179513d2e1cf6b577a92c 100644 --- a/src/com/android/settings/deletionhelper/ActivationWarningFragment.java +++ b/src/com/android/settings/deletionhelper/ActivationWarningFragment.java @@ -19,8 +19,8 @@ package com.android.settings.deletionhelper; import android.app.AlertDialog; import android.app.Dialog; import android.app.DialogFragment; -import android.content.DialogInterface; import android.os.Bundle; + import com.android.settings.R; /** diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java index 92aa61246fa9677d2d60ca25ac2b0144af91ee7a..d11e68b64a44b5006f4ca4216e34e8f00aa516e8 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java @@ -16,11 +16,12 @@ package com.android.settings.deletionhelper; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.format.DateUtils; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 9e41e62a4e140a5b6cae1c897ade65fc7fe1f77d..20ac6ea5a86a0d3609da86624b484aa53606e16e 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -20,13 +20,14 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.DropDownPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index 011deffc95073c10e55cc528d343c642a4bab0ca..e7cddf36e96e890da1d3f7c7cd575d257c515ee1 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java @@ -20,14 +20,15 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import androidx.preference.Preference; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.widget.SwitchBar; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.Utils; +import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; /** Handles the logic for flipping the storage management toggle on a {@link SwitchBar}. */ public class AutomaticStorageManagerSwitchBarController diff --git a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java index 9608f17da10b010a015fffa0d1b4e0c88cde0f58..0f21deebf0d2404ce39567385cf4a9dbc56442d2 100644 --- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java +++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java @@ -21,6 +21,7 @@ import android.bluetooth.BluetoothCodecConfig; import android.bluetooth.BluetoothCodecStatus; import android.bluetooth.BluetoothDevice; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java index 86622eec5a75711212ed2e2a1239886607ddeba2..468c5bdd5c9743e2d0b78600ec7fa72aac1d940e 100644 --- a/src/com/android/settings/development/AdbPreferenceController.java +++ b/src/com/android/settings/development/AdbPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java index c785bb67e24227cdcc3997cb8ae52dd56ccbe1cf..14474f29785eafa3852b6ca08ac17310ecaabe43 100644 --- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java +++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java index 35943951db4b18697af9849187fe3a5df943d05f..766352a6caeea750eab6641011899f370e5c1f27 100644 --- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java +++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index 19db369d285a9bad2a25cdea2d54e647f0d5a792..15e26633439a299de8a1cce76659db07df8ee60e 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java index 7333aad656aed3e6a912f96e1fdcc9a94640dd32..690d079257c2efe0a0ae0204be08b6caff75bffb 100644 --- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java +++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java @@ -20,6 +20,7 @@ import android.app.ActivityManager; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index 6ba0a80417aebfb1ac90fae6ed31cc00f94e43fe..b0e35d3de09225f294438a1f0e63cd7c9328afcd 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index 6fe03dd1fe8b9fb0be7af83c8232646954712a66..d315517566cc77664d782dc8c27fe1b829385061 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java @@ -19,7 +19,6 @@ package com.android.settings.development; import android.app.AlertDialog; import android.app.Dialog; import android.app.FragmentManager; -import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; import android.os.PowerManager; diff --git a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java index 4ea2456f46fbfcb0a09f9566643b3b4902941a7b..77f0f507f8eaccb12dc986352371e6e7f6f1cb26 100644 --- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java +++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java index 688f125d1a698db60f6d4a8c95e23b262b7cbba3..136ddad5fcf9c54c7430e53e0854f1b7e7ec6776 100644 --- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java index 3e913bdfca14f12cd688ff6e89a1110f3689034a..849e981981b38aafd7416f16174bc8e020b968ce 100644 --- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java +++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java index 6ad3689334a0838ad50fe4b19f42aa9fc1670ce5..ee6af1c8785f136e106099a8fd7a79635b0ae9ea 100644 --- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java index 4b1bf5cb292358a7809d878590e86a7bb8aab8ab..c92fe90a93653c01f99af99a22b26d0f596bf215 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index 22b9f2b86ae8e9939dd7849bd495308b90bcd1c8..99ced77325521f5afe35ef9e3f5bb597a4a2fea7 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 74f879462c2e7c795b5268e4c09c2036798ec4a4..bc33a7c7b08bd93c2aeb21ee63d01f573100d882 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index 9598b377f9770ecf374d29bbface2309d3ffabd1..ce23e3fc03c1cac27035c82b17aaa1efa5588a33 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -22,11 +22,12 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserManager; +import android.text.TextUtils; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.Log; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index 54ca4687850fbe1a8a17e5034d6d471ec3a47448..9e5666ef22eba98ece03257780d94ad981db8eaa 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -21,10 +21,11 @@ import android.hardware.display.DisplayManager; import android.hardware.display.DisplayManager.DisplayListener; import android.os.Handler; import android.os.Looper; -import androidx.preference.SwitchPreference; import android.util.AttributeSet; import android.view.Display; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java index ae459acbcabf27290faf4b6d807405c8cfe7ff4c..54df6badb0249420d57d459fee76f791a9af60fc 100644 --- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java +++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; +import android.widget.Toast; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.widget.Toast; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/DarkUIPreferenceController.java b/src/com/android/settings/development/DarkUIPreferenceController.java index fc457716bc607adfc1a7d127cc90a194b91c5266..dc5eeb1fc53949b56a0410ca56ae151f77e48d50 100644 --- a/src/com/android/settings/development/DarkUIPreferenceController.java +++ b/src/com/android/settings/development/DarkUIPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.development; import android.app.UiModeManager; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java index 9b3f1d834710b1fa0c36f597effb0e8aa2b66c99..da4b94b15936d4fd3c10e3598e8e25547a9dfa10 100644 --- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java +++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java index 03e3dab18e94451a2bfc933316b5ba23dc2d4f55..8f15c8697b6cf11b4fdc9ee463489fd7f953ac80 100644 --- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java +++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java index 8950b86bdcd92330b2a94fbdb786ee30597478b9..04d819c86a68ed1cb37de7c6e9e54e40b88d6cbe 100644 --- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java +++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 8518c7446eb328841323b2f57f3d5f83fc0e1809..a7cd761c066423b594cb923a704c48f3dabe1a46 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -28,14 +28,15 @@ import android.content.IntentFilter; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Switch; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java index 5ecb67633dd725cd3d8e11fc278ee60a9e5631a3..f10e171c8c7832df32b90e3796d9f412a4dac010 100644 --- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java index 86663682d62ce7fdb8a120f76dc9fd281c3ed2a6..6348d623e19dec08f3d602fdb9d0eee1c26c1c2c 100644 --- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java +++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java index 9882975ff6bd002a09069349fb4ec290d9e35bff..163605fb1759abb4b8dd03568cc0fd254074abd0 100644 --- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java +++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index f8326abf313a7c9dad94d0e4d4d2d5b4cbb96da1..a0628b0f6377052141961230ff62210aa3d8963f 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -21,9 +21,10 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.storage.IStorageManager; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java index 82ab190551bb9b644cdcdb54057b1a0635d0e192..fa9761af3ce90e39effff2c87d5e1a9475642888 100644 --- a/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ForceGpuRenderingPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index 17b5e4bdacab83c9462dd9e2d82c8f7c30bc92f2..be6efca8772d90ceef1812d0489b4db8998074d6 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index e6c3813d448c369de08b780a4c47904f81581630..5b19f36c15230aad3d34748f9b927708fba95a17 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java index a7613763a798c9961307153b02073765a6a8e93e..d79c231e334528dfb43e5d17e63fc70d4de7693d 100644 --- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java index 6b8ead5f5e29f453d2ffce6e823418454a6540fa..0087e28709397ea9d6bd7a7bb4c072b68ab81c29 100644 --- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java +++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.ThreadedRenderer; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java index 4c501b6fb77f3228e835648e9445db9d55f7dadb..8ffbdcdc1cc0fa99720080ae652f537d3c36d48d 100644 --- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java +++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.ThreadedRenderer; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java index 69f1ba1003e6364c48f3cf209795776e90dc4e00..c10e1070a48e9c6250ea4bd9268f42d0667816be 100644 --- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java +++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java @@ -21,9 +21,10 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java index 6dcca77520919f53adc631137b48b60ac09a3361..52fe8e04a7659c6978d0c2f39b04bafe8f20b0ac 100644 --- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java +++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.os.SystemProperties; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java index 839397b68e99af1435388abd2f97fd811672e904..0ba2c42dbcff1bbef40f5d3a045bfee0e69915c6 100644 --- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java +++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java @@ -21,10 +21,11 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index 18e3a061cd856254bf6d43096da3055c22ad251d..d970f4266eb7313f74269c2733e6208a23b09639 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index be60ed7c1853ad36a0ebf63ac799080364ec1dcb..453ab3d7c742ec056ee8caca16a73c3b85e4cedb 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -3,10 +3,11 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java index 9c7a0378cb3c2d30bdbd5ec1a27ffac116e09f00..1386cec37064bbd26879b36090578d3b96f02d41 100644 --- a/src/com/android/settings/development/LogPersistPreferenceController.java +++ b/src/com/android/settings/development/LogPersistPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.annotation.Nullable; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java index cae07668471f14d2988de24cb19cef4b7dfdb79b..3a62e63175e74e35841ed4a5672f942c0cca59b9 100644 --- a/src/com/android/settings/development/LogdSizePreferenceController.java +++ b/src/com/android/settings/development/LogdSizePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java index 84120797c34c47620580b0b25460a1156d85798c..1b20e70a5789185ba70cd6682c507f434a3767f7 100644 --- a/src/com/android/settings/development/MemoryUsagePreferenceController.java +++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java @@ -17,10 +17,11 @@ package com.android.settings.development; import android.content.Context; +import android.text.format.Formatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.format.Formatter; import com.android.settings.R; import com.android.settings.applications.ProcStatsData; diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 031ff9efdd857727f395f026e18a9ef8bd8ef798..78054ae2ab7dfd3120eeee1b7050f6d99068a6e6 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index bbce58262dbcc2a203913ca744091996a96e2df3..b1bd48874cc72e032249d874867c185005673768 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -26,9 +26,10 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java index 5e159c65d57a3594cddac7736743cffea9f338f7..775b70871f28d03c3d93c733b7eee56caf580789 100644 --- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index 243cd3f281fa81e5734571b23367b3da5b3e5704..cadb0bcfd6b486109a7bbd9e9834ea928dbbc962 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -26,10 +26,11 @@ import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; import android.service.oemlock.OemLockManager; +import android.telephony.TelephonyManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java index fe07083e45d79d8843b39aa1c9ea8b2909f41bc1..3cf1f4e8bbf987c77f1714a99437be155c37bd02 100644 --- a/src/com/android/settings/development/PictureColorModePreferenceController.java +++ b/src/com/android/settings/development/PictureColorModePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.development; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java index 079184c7dd7d039a33cb0e2d7192ed121d559968..0fd0137cb243a6ad92a9524092246c3b3065cbfe 100644 --- a/src/com/android/settings/development/PointerLocationPreferenceController.java +++ b/src/com/android/settings/development/PointerLocationPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java index ba9ce7746d3083aa4cf2b5dd564ebf4ab2ad3a43..52e730ba36aa3c80f955f85d4a7bad11a902a460 100644 --- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.ThreadedRenderer; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java index 9ae9216402ed8acb67b8a1a1c3f71a3b6e37da7a..c74e995540dbe0d05cbd2eb2368a7df62b2d7945 100644 --- a/src/com/android/settings/development/ResizableActivityPreferenceController.java +++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java index a88f16f90bd39bc89368a2d7c65294e420b55f3c..97b366a5a6c29770239787f8db871073f205f2e1 100644 --- a/src/com/android/settings/development/RtlLayoutPreferenceController.java +++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.app.LocalePicker; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java index 21f9881ec0bc638dfaa8154f949c23627694a441..3e1653d8a437e9af06da5e653639a6501cb95cab 100644 --- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java +++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java index 8974c0a8ef9813760d80497abeefa69ad8359060..a72c0e05e1a35345f9e205cb271b00b4e3101a98 100644 --- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index 823bf2e9fa5d7714087e3b1d09b91745152aec5d..dcc830208039c3931dc9894c8631c6267fa4ebc9 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -25,6 +25,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java index f7f5b6ddd1456bfbef51a9f35634b0a16402e3a1..05ddf3abba816585435ed47a167984316a672d83 100644 --- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -20,11 +20,12 @@ import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; import android.os.ServiceManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java index d0df9c8d3a0b92ec59169c060a30e15e42a9ffa5..5e0cda829445d2e1d67574362feefcd2b71bb4f7 100644 --- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java +++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index 4d3fdbf6ca789d28d04d022d63de75eb4d2f1af7..fb091b7d47379ecf71ec23c6e4320de2739b7dd2 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java index ffd3da27cd118bb72e5386349941473945b4eecd..5dadb6ff6c26a8cb1e87eba137037d41c910f2ff 100644 --- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java +++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java @@ -21,9 +21,10 @@ import android.os.IBinder; import android.os.Parcel; import android.os.RemoteException; import android.os.ServiceManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java index 87fbf6928b5a7519acea2c2e349c25cf4414e796..25d421ddf2b713dc9d2c850c3142ee2f3da07001 100644 --- a/src/com/android/settings/development/ShowTapsPreferenceController.java +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java index ed16b685b78e8aa7d12cecc453d47449736164fa..56fa76d379c8ae6697786ba5309dc51071b40fef 100644 --- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java +++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java @@ -20,10 +20,11 @@ import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; +import android.view.accessibility.AccessibilityManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.accessibility.AccessibilityManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java index 31eb71aff88425aead5aefdb1388ee9230416297..7d67b9e4d07aea12dca852eb36f9474f0862f1d4 100644 --- a/src/com/android/settings/development/StayAwakePreferenceController.java +++ b/src/com/android/settings/development/StayAwakePreferenceController.java @@ -23,6 +23,7 @@ import android.net.Uri; import android.os.BatteryManager; import android.os.Handler; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java index 2af301c0d6d87aac40834d559f28ac15f25989f2..c28e476621916094cc880294c22563205ac89718 100644 --- a/src/com/android/settings/development/StrictModePreferenceController.java +++ b/src/com/android/settings/development/StrictModePreferenceController.java @@ -21,10 +21,11 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.view.IWindowManager; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java index 7174b457e0b63dc6edd802ea9c8f7ed312d8632b..476cf50ffe6dca67d3eb46b665e4ddc2f894774e 100644 --- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java index 72b0bf3a31f4e912035611eaa33a9a2a348e3367..f838a76cfa8285983231bd3a4ae293a5669058fa 100644 --- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java index 6f57f88834069ec07900a6642ddfa2c16c2ace8f..0a8e941ea57ae468ffad08906cc63d4f81392df3 100644 --- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java index c73412dbb3597357da3294b87442499adc4260f9..335a48de82a35ab2f79d834e8a0dbb89ed52688e 100644 --- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java +++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index f151134705cc1afa7989978f7db8a00058599fb7..77094e9b35475aaa9e8d7c22985a3fc492d826a5 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -22,6 +22,7 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index 9959f12ce1a153649b77dff794c5840065b93274..d11fe37c66a8f368116098775404af118a2de7f2 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -26,10 +26,11 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java index 7796cfda3504ecfc977ddddbf42796e188c05553..fb48cd54ea1edf395da55856212e92fe00a83dad 100644 --- a/src/com/android/settings/development/WebViewAppPreferenceController.java +++ b/src/com/android/settings/development/WebViewAppPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.webview.WebViewUpdateServiceWrapper; diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java index 9582ebe4ad3b65c12f1a9756a383ed2ac07d0781..fed07f654361b8f1e5bda8dfca1fe63b63062bdd 100644 --- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java +++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java index 71ca8f1956d661bf1426f5bc187b23b869394e48..0236f1585e2eb512bd8ed3462d700b93f8b95886 100644 --- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index c3c9ca3ec139bb1121fc50fac2dbd7bc75f7c818..de53a2d714697038d29098c87050567a23a300a4 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.development; import android.content.Context; import android.net.wifi.WifiManager; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java index 6414372470d0999b80f01886d0f3d5d91474d533..70b2e2de186ba9bd9eb7a09d918433137addb9c1 100644 --- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; +import android.view.IWindowManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java index 7dd8f28f82525b5505ad02d59e2bb6486141fad0..a8377090e8c03a5d1238cf2df41a1ac3f6ef9778 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagPreference.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagPreference.java @@ -17,9 +17,10 @@ package com.android.settings.development.featureflags; import android.content.Context; -import androidx.preference.SwitchPreference; import android.util.FeatureFlagUtils; +import androidx.preference.SwitchPreference; + public class FeatureFlagPreference extends SwitchPreference { private final String mKey; diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java index 960979c40f168a28b32878a0c667ab34fbc900ea..2acda4ebe7728037525fc7ef72808f3e7573e9f1 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.development.featureflags; import android.content.Context; -import androidx.preference.PreferenceScreen; import android.util.FeatureFlagUtils; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java index 71d3d07888e3227527458655c06272ebe244d730..0362074663a439f438262b9e2306275c5a493714 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java +++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java @@ -25,11 +25,12 @@ import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.os.ServiceManager; import android.service.quicksettings.TileService; +import android.util.Log; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java index 1094ab9c7bb9326fd65a6fd80a3008b4c6c58d4a..165c74e410c2f198912e3b2007cdbc881bf8fb42 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTiles.java +++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java @@ -25,7 +25,6 @@ import android.os.SystemProperties; import android.provider.Settings; import android.service.quicksettings.Tile; import android.service.quicksettings.TileService; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.IWindowManager; import android.view.ThreadedRenderer; @@ -33,6 +32,8 @@ import android.view.View; import android.view.WindowManagerGlobal; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.app.LocalePicker; import com.android.settingslib.development.SystemPropPoker; diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index ca2175b4c13797224efcedb2d1483441573144a0..fff1f58940ec3d75dd45f7ee8571383005c02c9b 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo; import android.accounts.Account; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 707d660b2c8e542602b93058f00492d36a41c5dd..aa6fe41d19137fc806964f3d4dee6f139bbf3a92 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -25,13 +25,14 @@ import android.content.pm.ResolveInfo; import android.os.Build; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; import android.util.Pair; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java index 5a4dfc26235543a4d6ce6cad7241d3be2f0ba63e..f9665dabdf544910001bfd1fa96327a8a6852945 100644 --- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java +++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java @@ -21,9 +21,10 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java index 1fc54cd6755c90c88d6a47047edb5b9f7b27d56e..f4661ba82a902d4ece723533ce17c3ae1e703580 100644 --- a/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceModelPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; import android.os.Build; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java index fc89dc19420e9d8f37cced2548d2168d285f06f7..5c9e172f9227bd72cbae1211e4ede1529a7769cf 100644 --- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java @@ -23,11 +23,10 @@ import android.net.wifi.WifiManager; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.SpannedString; -import com.android.internal.annotations.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter; import com.android.settings.core.BasePreferenceController; @@ -35,7 +34,6 @@ import com.android.settings.widget.ValidatedEditTextPreference; import com.android.settings.wifi.tether.WifiDeviceNameTextValidator; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java index 62077ca2b1427d42a90584f3a4e14af213697a1e..1150838dacfc6043659cea1efda49c2c3d6e032b 100644 --- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.os.SystemProperties; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java index 52721821a417a0c60d7cd7b5e74cf10d28a2d7f7..eecf9eed236f8e406a12351dff815746146a3cfd 100644 --- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.deviceinfo; import android.app.Fragment; import android.content.Context; import android.content.Intent; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index 58155af1ca5e925153a33d6f7c857df8ebd6844b..8f32ede4c08c744fce3c307d383fbf2266d456bc 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -21,12 +21,13 @@ import android.app.Dialog; import android.os.Build; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java index 1af63975f5dbd0df23d7e9aa6a18e9ed174599ad..6ba45b35eebc91c747baffe7c5ff5915808af742 100644 --- a/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/IpAddressPreferenceController.java @@ -18,9 +18,8 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; - +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractIpAddressPreferenceController; diff --git a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java index c0ae99a1ee59d3953b86b1c24effddab223b5167..5c2b6417102c7c0a078f2aa6bb4abc84ee9b7303 100644 --- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 95cd09c39542d973689f432d40dff7dc7784e9a3..8e60b06fee2cf3b964f37a2708b41d5d0e090d2c 100644 --- a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java @@ -17,9 +17,6 @@ package com.android.settings.deviceinfo; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -27,6 +24,10 @@ import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index b6d50cef75aa6aab97bb964be55f1813f8dbafbd..054b7cfda7276c6f59b2b31ed93ebb31caefe24d 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.app.Fragment; import android.content.Context; import android.content.DialogInterface; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java index 6047f8cc082e5c0fe9094e75885e999a2ec03ed3..4bc3bccd77453e90d90c2427778ad218c26af698 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuController.java @@ -24,7 +24,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import com.android.settings.R; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu; import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 54e0eef48970ee5d2746f0d39417a7bb17441258..a8b24f62c5e4bb8570036d024b9a4127327c8db1 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java @@ -36,10 +36,6 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; @@ -51,6 +47,11 @@ import android.view.MenuItem; import android.view.View; import android.widget.EditText; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.StorageUseActivity; diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 5982be68a284df774da2a60965f04e99baff7f34..84769744839a0e0c861cc949f0d1a003e4f46c03 100644 --- a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java +++ b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java @@ -28,8 +28,6 @@ import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; import android.provider.DocumentsContract; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; @@ -37,6 +35,9 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 5575790c322b5a613a39eac068934cadaba80e74..b0a6d343d5c330a4d99facdda44a255b9929dfa4 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -28,10 +28,11 @@ import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.util.SparseArray; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java index 6cf85b1fc2010e9886596bfe6b71022f986a575a..0766a740b3f2b9f7ef255673f936984c0a53c0bd 100644 --- a/src/com/android/settings/deviceinfo/StorageItemPreference.java +++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java @@ -18,12 +18,12 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.content.res.Resources; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; -import android.view.View; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.utils.FileSizeFormatter; diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index 5e66fdd0de79777dcdd2c3f96b8b84c74f8a5ac8..b17d01fcfc5dd91d21c4b4d77bf32fad1e9314f0 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -24,9 +24,10 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.annotation.VisibleForTesting; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 9e4a1e2732b848bebbab72b801a97032c0d782b1..082a02402618db948d5922a2a5c0a618f58aaaa3 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -35,16 +35,17 @@ import android.os.storage.StorageEventListener; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; import android.os.storage.VolumeRecord; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Formatter.BytesResult; import android.util.Log; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java index 292ee44be16bef1e9f916ee71a2f26ca57afb014..72b67de1ddde3ec2c97f062dc99f5225b0da9795 100644 --- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java +++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java @@ -18,13 +18,14 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.graphics.Color; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.MathUtils; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class StorageSummaryPreference extends Preference { diff --git a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java index 095cf15af4cdac7b52f95edb43dfe6c56671130e..81ac97b21d3d4918f3b7f8d93d97dd27d898fbc6 100644 --- a/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java +++ b/src/com/android/settings/deviceinfo/StorageUnmountReceiver.java @@ -16,6 +16,8 @@ package com.android.settings.deviceinfo; +import static com.android.settings.deviceinfo.StorageSettings.TAG; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -25,8 +27,6 @@ import android.util.Log; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; -import static com.android.settings.deviceinfo.StorageSettings.TAG; - public class StorageUnmountReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreference.java b/src/com/android/settings/deviceinfo/StorageVolumePreference.java index b6466cae9854fd6bfd49a0ec9439765a84c5421d..525c5621a70eebdd8267101ad3d6ce990975b94e 100644 --- a/src/com/android/settings/deviceinfo/StorageVolumePreference.java +++ b/src/com/android/settings/deviceinfo/StorageVolumePreference.java @@ -23,8 +23,6 @@ import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.util.Log; import android.view.View; @@ -32,12 +30,15 @@ import android.view.View.OnClickListener; import android.widget.ImageView; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.deviceinfo.StorageSettings.UnmountTask; import com.android.settingslib.Utils; -import java.io.IOException; import java.io.File; +import java.io.IOException; /** * Preference line representing a single {@link VolumeInfo}, possibly including diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java index 1f393c5128ea5e879c2c65c0330982f3578481b4..7a2f0c105f326de76cc0ba3a493fe77eff1abe94 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java @@ -16,20 +16,20 @@ package com.android.settings.deviceinfo; +import static android.content.Intent.EXTRA_TITLE; +import static android.content.pm.PackageManager.EXTRA_MOVE_ID; + +import static com.android.settings.deviceinfo.StorageSettings.TAG; + import android.content.pm.PackageManager; import android.content.pm.PackageManager.MoveCallback; import android.os.Bundle; import android.os.Handler; import android.util.Log; -import android.view.View; import android.widget.Toast; import com.android.settings.R; -import static android.content.Intent.EXTRA_TITLE; -import static android.content.pm.PackageManager.EXTRA_MOVE_ID; -import static com.android.settings.deviceinfo.StorageSettings.TAG; - public class StorageWizardMoveProgress extends StorageWizardBase { private int mMoveId; diff --git a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java index 8375310c107e28fdfc3fb0944cad7c8fd5ce0a62..c7005966c480019256c4092223ca8c89208e2ecc 100644 --- a/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java +++ b/src/com/android/settings/deviceinfo/WifiMacAddressPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.deviceinfo; import android.content.Context; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.deviceinfo.AbstractWifiMacAddressPreferenceController; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java index 21663f6820ec1f63c76c2cfa3f23f95e95ed6de2..0e36d85899af550637d6ae1d87fdf1df3131ee56 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java index 6dc651abad15fc37a719145cf83c9fc28e4e5bdf..ba4eb7af74813b94fef51197682f496d9c5425fa 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java @@ -17,9 +17,10 @@ package com.android.settings.deviceinfo.firmwareversion; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; public class BuildNumberDialogController { diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java index 277024576a818e4890f7d0b2cc2505e1a75898b6..17415cca5731fa7b983a393041df67498d16905e 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java @@ -22,10 +22,11 @@ import android.os.Build; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java index 785ec595b097bca438df0e48dd09a94dcaef989f..fbf44a15e01f1b470d84599eb79e39b734f0c8eb 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.deviceinfo.firmwareversion; import android.app.Fragment; import android.content.Context; import android.os.Build; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java index cf8ee61090e1c40efb5cbb44b4ca9049cae86587..d72d5f62e780ea3133b57c7e66be19c1403cee02 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogController.java @@ -19,11 +19,12 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index 71da4a3d5db3576bf265a7a90e114683ddfc7613..dc4ba2fb2936853db7f0911730fcdf5fe9e51524 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -18,8 +18,6 @@ package com.android.settings.deviceinfo.imei; import android.content.Context; import android.content.res.Resources; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -29,6 +27,9 @@ import android.text.Spanned; import android.text.TextUtils; import android.text.style.TtsSpan; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.internal.telephony.PhoneConstants; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index 3cc90e482931979bbdf3e9f080229b76d699e1f3..084d44f424ebfb18c96d568b422a086c0882129a 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -21,13 +21,14 @@ import android.app.Dialog; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index d673a280274650174b30d2f2c590a5b2531686ec..8d87843323d4886f0eb3572c54d4280115b639ba 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -20,10 +20,11 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.app.Fragment; import android.content.Context; +import android.telephony.TelephonyManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 114e4e449aa8d4ec080e802718531659181e887e..9cea62d1e31af9806710a50559c5bbf3dec553ea 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -30,8 +30,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.PersistableBundle; import android.os.UserHandle; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.telephony.CarrierConfigManager; import android.telephony.CellBroadcastMessage; import android.telephony.PhoneStateListener; @@ -46,6 +44,9 @@ import android.text.TextDirectionHeuristics; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 3f714712a0800e674487e6b1a77a79615dab953b..888dc25f5c6a6b08c8b440eaf9a322d2d9164ad8 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.deviceinfo.simstatus; import android.app.Fragment; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceController; diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java index 92078036c17815f467df9c67653988adfaf78807..741ad7bb6afc4687e804634c4a901b2723239cd0 100644 --- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java @@ -21,6 +21,7 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java index f07af5e56e098d8b5c133a91c46b49c863a05744..e6d9a724d94e07c137e18aa8262bbc9c954d752e 100644 --- a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java +++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java @@ -19,9 +19,10 @@ package com.android.settings.deviceinfo.storage; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.applications.StorageStatsSource; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java index 1eccb67f5483fd49520f28d83d7f8a7956660b04..ee9fad6d52a1af24843a0087e850f94d4acbee1e 100644 --- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java +++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java @@ -20,12 +20,13 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; +import android.util.SparseArray; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index 6ae4a6f0b202757c09a7a40069c7fee101a4d66b..e9e8c4f8277461ab3c5422e055d1d62ef3554d5c 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -26,11 +26,12 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.VolumeInfo; +import android.util.Log; +import android.util.SparseArray; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java index 813261f50b3d7be657b7c7275181180dd7db044d..a025d8c4dafe0a120ae498bd4d4f4dff5f0a7792 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java @@ -20,28 +20,20 @@ import android.content.Context; import android.content.Intent; import android.graphics.Typeface; import android.os.storage.StorageManager; -import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import android.text.SpannableString; -import android.text.Spanned; import android.text.TextPaint; -import android.text.TextUtils; import android.text.style.StyleSpan; import android.util.AttributeSet; -import android.util.MathUtils; import android.view.View; import android.widget.Button; -import android.widget.TextView; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.DonutView; -import java.text.NumberFormat; -import java.util.Locale; - /** * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left * on a given storage volume. It is visualized with a donut graphing the % used. diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java index f4c33be5ae3d5c58c1a5eb47a351ca7fd58a6346..1a5152ed4005d24dbfd0451019ac2de3f3f735bd 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.deviceinfo.storage; import android.content.Context; import android.os.storage.VolumeInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.Formatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/deviceinfo/storage/UserIconLoader.java b/src/com/android/settings/deviceinfo/storage/UserIconLoader.java index d1c29dfe38a951dd33167881322e9f4ce6b6613f..e85bf08a5ea41bf625598057bf6d089a9889475b 100644 --- a/src/com/android/settings/deviceinfo/storage/UserIconLoader.java +++ b/src/com/android/settings/deviceinfo/storage/UserIconLoader.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import android.util.Log; import android.util.SparseArray; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/deviceinfo/storage/UserProfileController.java b/src/com/android/settings/deviceinfo/storage/UserProfileController.java index 1778d13f325cf0b268f16793b77230dd1dfe94e7..afc68b5d6a7a7763283aec62cb3d1cacf11d8ecd 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -21,9 +21,10 @@ import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.storage.VolumeInfo; +import android.util.SparseArray; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.Preconditions; diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java index a9b047c58b458522ffcae228f5f8b58e0f2868dd..3d1e9b805fe6d57293fb58bcd7ffa48910b3991f 100644 --- a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java +++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java @@ -19,6 +19,7 @@ package com.android.settings.deviceinfo.storage; import android.app.usage.StorageStatsManager; import android.content.Context; import android.os.storage.VolumeInfo; + import androidx.annotation.VisibleForTesting; import com.android.settingslib.deviceinfo.PrivateStorageInfo; diff --git a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java index 0da5dbeb7686935f21f6500272e892da4efa9a64..58054b501afef5b945ecf61e2fd88246c6eefc01 100644 --- a/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; diff --git a/src/com/android/settings/display/AmbientDisplayPreferenceController.java b/src/com/android/settings/display/AmbientDisplayPreferenceController.java index f429b0dfe5a2e988c4197ad719e0c34d1b0a9e9d..6638282343b3c0519b3c439803f5d54ce7a27bd8 100644 --- a/src/com/android/settings/display/AmbientDisplayPreferenceController.java +++ b/src/com/android/settings/display/AmbientDisplayPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.display; import android.content.Context; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java index 8745e3ff18088aed8dff9f4f345ffae0e72c2532..01a5539e73667e89d45c6e8d22e8c826543ac1c1 100644 --- a/src/com/android/settings/display/AmbientDisplaySettings.java +++ b/src/com/android/settings/display/AmbientDisplaySettings.java @@ -17,7 +17,6 @@ package com.android.settings.display; import android.content.Context; -import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; @@ -26,12 +25,8 @@ import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.gestures.DoubleTapScreenPreferenceController; import com.android.settings.gestures.PickupGesturePreferenceController; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/display/AppGridView.java b/src/com/android/settings/display/AppGridView.java index 00275375280f3b0436af9be193d6eeefeb33aebb..effc6af8bb7b709c75895b034b8dc40b41fadfc8 100644 --- a/src/com/android/settings/display/AppGridView.java +++ b/src/com/android/settings/display/AppGridView.java @@ -22,7 +22,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.drawable.Drawable; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.view.View; @@ -31,6 +30,8 @@ import android.widget.ArrayAdapter; import android.widget.GridView; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import java.util.ArrayList; diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java index 7c93d2859085f7c98e1e0635cf9438c05f2144e4..027d4c454074cf3e9f5074a524641e8ac53c1943 100644 --- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java +++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java @@ -13,21 +13,21 @@ */ package com.android.settings.display; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; +import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; + import android.content.Context; import android.content.Intent; import android.provider.Settings; import android.text.TextUtils; import com.android.settings.DisplaySettings; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; -import com.android.settings.R; - -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; -import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; public class AutoBrightnessPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java index 6bdf75aebf533366edd72749f0303f37833285f5..c852c01f380dbdbfa28758f55f1cf56830128f96 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -14,9 +14,10 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.view.RotationPolicy; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 632e3390703636c9a0a69b02338ca1a466457147..e6a62bc5016725063a37f3f04414731f847ff2fb 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -15,16 +15,17 @@ */ package com.android.settings.display; +import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; - /** * A controller to manage the switch for showing battery percentage in the status bar. */ diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index be79f66b55680c33c3d6e5943569c591c64ecead..05f43f650acb6a66628b686f6a4338e83994765d 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -28,10 +28,11 @@ import android.os.ServiceManager; import android.provider.Settings; import android.provider.Settings.System; import android.service.vr.IVrManager; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index 9b1b2c296c4ae797500ace7a9f8d630feb3ec83f..8e72a55227b92aacf284e2614ca8f2cdc5055d3e 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -13,17 +13,18 @@ */ package com.android.settings.display; +import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; + import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; - public class CameraGesturePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ColorModePreferenceFragment.java b/src/com/android/settings/display/ColorModePreferenceFragment.java index ab17c72051b6b3e1862a778594d8ef8ea5f6a7d1..e6ee77d7640ef89b63c4b08102e62a2f878dcba6 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -15,14 +15,14 @@ package com.android.settings.display; import android.content.Context; import android.graphics.drawable.Drawable; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.applications.LayoutPreference; import com.android.settings.R; +import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; diff --git a/src/com/android/settings/display/ConversationMessageView.java b/src/com/android/settings/display/ConversationMessageView.java index b054444fe57088e281d7111b75481c6a8bca649c..22e1f205509fb9607f948e674d3a288166eb4385 100644 --- a/src/com/android/settings/display/ConversationMessageView.java +++ b/src/com/android/settings/display/ConversationMessageView.java @@ -29,6 +29,7 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; + import com.android.settings.R; /** diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java index 581a3ee444e1b6e79574c7645da932859090d301..e55e578996eea9e744dd830b06e5c02eb7b5a440 100644 --- a/src/com/android/settings/display/DensityPreference.java +++ b/src/com/android/settings/display/DensityPreference.java @@ -26,8 +26,8 @@ import android.view.View; import android.widget.EditText; import com.android.settings.R; -import com.android.settingslib.CustomEditTextPreference; import com.android.settings.Utils; +import com.android.settingslib.CustomEditTextPreference; import com.android.settingslib.display.DisplayDensityUtils; import java.text.NumberFormat; diff --git a/src/com/android/settings/display/LiftToWakePreferenceController.java b/src/com/android/settings/display/LiftToWakePreferenceController.java index 42feda2c960d890a0b0da6612a0acb20dccb323c..d12b7c4c15dec34def122a849ea1e7392a4a5b85 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -13,18 +13,19 @@ */ package com.android.settings.display; +import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; + import android.content.Context; import android.hardware.Sensor; import android.hardware.SensorManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; - public class LiftToWakePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java index ffc73860c2949efe37e47952a8e1a62420f861f0..6421ebdbd4e6f56862deed1dea22aea4fcbe8611 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -17,12 +17,14 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java index bb42c857a7e7c7242b6c894d33c7b9d35d89aaec..cfe17915fd68012bf5d17b1caf7bc8b747723c5e 100644 --- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java @@ -17,9 +17,11 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index 1eebb6be5ae25a74f96bf77e584f5e2b38f0c542..e2abe1b24c83b49e65a7b06806aa677fa87b4e98 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java index 19297b82f32d1600830f36df45a418f1dfe4d8d7..255003c701155f510cb7c774b2174171d3e5bcfa 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java index 2075cfca322f806569065cb3b238150cad2cd891..bb598590bc52219bdd1a2f2ce5c5d116c030c96b 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java index 9f215d9b59910a955c64d98f149af7c0da1ceeec..db053a596ffee7f93ecc7640511deb1122957203 100644 --- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.display; import android.content.Context; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.app.ColorDisplayController; import com.android.settings.core.SliderPreferenceController; diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java index a1608d75e09e7ba01fc652fc1384f3f19ba49bf7..a84ba5888160479b81a6f52228ab77c92e509064 100644 --- a/src/com/android/settings/display/NightDisplayPreference.java +++ b/src/com/android/settings/display/NightDisplayPreference.java @@ -15,9 +15,10 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.SwitchPreference; import android.util.AttributeSet; +import androidx.preference.SwitchPreference; + import com.android.internal.app.ColorDisplayController; import java.time.LocalTime; diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java index 0bbab935f8a3dbf56292a83bf039ef7ff240bba6..3cb57e0272bf98bfe6546c8dd9569f5bdd53ce69 100644 --- a/src/com/android/settings/display/NightDisplayPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayPreferenceController.java @@ -16,9 +16,9 @@ package com.android.settings.display; import android.content.Context; import com.android.internal.app.ColorDisplayController; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settings.R; public class NightDisplayPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/NightDisplaySettings.java b/src/com/android/settings/display/NightDisplaySettings.java index 848ddd51ae6c6e477a680a08e6ac8e371b940734..564d9d3edf5c80caa82aa31fa39ff84daf3184cb 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -21,6 +21,7 @@ import android.app.TimePickerDialog; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 41620ea4704cec6ab27ba25e53160c3b3ceb2e41..5846a6583464e22be054ebd179a4e07eee53dd00 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -17,10 +17,11 @@ import static android.content.Context.UI_MODE_SERVICE; import android.app.UiModeManager; import android.content.Context; +import android.util.Log; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index ae44bf3e182bc2528294345ad26ec0d9289e2189..c1b0b4e9eb619cc69cd95252a32dc51203b87f83 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.display; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index 8451a2d4e3fa5fb4af933f5a281ac48728217d2a..f47d7da4384f727493a06cfb6e5ea862686fe760 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -17,11 +17,12 @@ package com.android.settings.display; import android.content.Context; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.AttributeSet; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; + import com.android.settingslib.display.DisplayDensityUtils; /** diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index cdb89fb4e11dac3e5f941708fcd0e52ac45fe7b6..40eaad330d026c18491d1d1ee03e479815b90eee 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/SystemUiThemePreferenceController.java b/src/com/android/settings/display/SystemUiThemePreferenceController.java index 3419ece9dd656012f5c2f9df4a63a28917060e8e..1660fc56d8b51ae2d8dec6b2cac600d3136d6b7c 100644 --- a/src/com/android/settings/display/SystemUiThemePreferenceController.java +++ b/src/com/android/settings/display/SystemUiThemePreferenceController.java @@ -20,14 +20,13 @@ import static android.provider.Settings.Secure.THEME_MODE; import android.content.Context; import android.provider.Settings; +import android.util.FeatureFlagUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.FeatureFlagUtils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; /** * Setting where user can pick if SystemUI will be light, dark or try to match diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index ff149ba838ae9f730bff52c5f40da784b1988b6f..5c2d97530dad673be7d8e73e48d5b613cd09ac6d 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java index abecc421e136a45d4ff9258a973a705c0ce6939e..6fc4b08bf00648547a42474765e2b2060ccf90a7 100644 --- a/src/com/android/settings/display/ThemePreferenceController.java +++ b/src/com/android/settings/display/ThemePreferenceController.java @@ -24,10 +24,11 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index b2a638ecdeb5594284f1299029bc21ba9991f8cb..763ef4e089cc3e994c0570b1f4b04b5365486463 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -20,9 +20,10 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.TimeoutListPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 9ff2861daedad9dd02ff85465cf04dbfd9c141d0..6fcb5b0bc1759b638002746960c1ca6dae889399 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -17,6 +17,7 @@ import android.app.ActivityManager; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 3c0e9476d8b4a255abcc4721f5006f8a486e8ff6..8e290046ef678edc4b27114e2cf719974b0ec3d4 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -13,24 +13,25 @@ */ package com.android.settings.display; +import static android.os.UserManager.DISALLOW_SET_WALLPAPER; + import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; -import static android.os.UserManager.DISALLOW_SET_WALLPAPER; - import java.util.List; public class WallpaperPreferenceController extends AbstractPreferenceController implements diff --git a/src/com/android/settings/dream/CurrentDreamPicker.java b/src/com/android/settings/dream/CurrentDreamPicker.java index 3ebce1c1d5408ffda002ea11004cc1362fe7b8fb..d33a1d9e25f3f156c8e451ccf8859f301a0cf44b 100644 --- a/src/com/android/settings/dream/CurrentDreamPicker.java +++ b/src/com/android/settings/dream/CurrentDreamPicker.java @@ -19,12 +19,14 @@ package com.android.settings.dream; import android.content.ComponentName; import android.content.Context; import android.graphics.drawable.Drawable; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; import com.android.settingslib.widget.CandidateInfo; + import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/com/android/settings/dream/CurrentDreamPreferenceController.java b/src/com/android/settings/dream/CurrentDreamPreferenceController.java index fe33365b2bdb90db5078062abfdae92eff07bb61..80f9f77fa840ed9e13e6e650d203f86f14dc240c 100644 --- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java +++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java @@ -17,12 +17,15 @@ package com.android.settings.dream; import android.content.Context; + import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.GearPreference; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.dream.DreamBackend.DreamInfo; + import java.util.Optional; public class CurrentDreamPreferenceController extends AbstractPreferenceController implements diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index 73762bd7cdf8d24a8ecd96f10a94d046dcf80e37..ebf8e989077599cef6f65981f22753e6d75a8d7a 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -23,6 +23,7 @@ import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; import android.content.Context; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java index 0a6c1b67464a9e7401647ac08eaec39f5063e564..5519a0efc49ee136e3364568fc9b11610feac7a5 100644 --- a/src/com/android/settings/dream/StartNowPreferenceController.java +++ b/src/com/android/settings/dream/StartNowPreferenceController.java @@ -17,9 +17,11 @@ package com.android.settings.dream; import android.content.Context; +import android.widget.Button; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.widget.Button; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/dream/WhenToDreamPicker.java b/src/com/android/settings/dream/WhenToDreamPicker.java index f6f89a89f8bc9bc9e9b015b17e5319577f90d01d..4c69b360bc0994f5af1f5fcd9b91045bd5705f6c 100644 --- a/src/com/android/settings/dream/WhenToDreamPicker.java +++ b/src/com/android/settings/dream/WhenToDreamPicker.java @@ -18,11 +18,13 @@ package com.android.settings.dream; import android.content.Context; import android.graphics.drawable.Drawable; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.dream.DreamBackend; import com.android.settingslib.widget.CandidateInfo; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/dream/WhenToDreamPreferenceController.java b/src/com/android/settings/dream/WhenToDreamPreferenceController.java index 702812e7fda7a52618fffd9cbb6893dca11d27d3..4108e850538ecc2958872ce75af8018552ab762a 100644 --- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java +++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java @@ -17,7 +17,9 @@ package com.android.settings.dream; import android.content.Context; + import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 026b79f0fd9f0a65495527624e8e8e6fa6972d9c..4047e8a4d35b7fef0546e0d1d94670ca459bd237 100644 --- a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java +++ b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java @@ -26,7 +26,6 @@ import android.graphics.drawable.Drawable; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.IconDrawableFactory; import android.view.LayoutInflater; import android.view.View; @@ -34,6 +33,8 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.DeviceAdminAdd; import com.android.settings.R; import com.android.settings.Settings; diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java index 520c436662ecfd28dee151bc07227a23c030c0ce..1c7ff620c3c98ec4139bd58dd4eacbd48fae48dc 100644 --- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -15,9 +15,10 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import android.text.format.DateUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java index 93ed1027c2550ad9ee9212650a03a90dd47fdc71..86d08cb674df48d737b6baf8e67d6eeb98239fd9 100644 --- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java @@ -16,6 +16,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java index 7b6d5df3fde4e9b1292ce6272ec39b175f55ee11..696561bad8cab083b23d127a3aa84f1867deaa53 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java index 07a39e3a90c07e04d9b246683673100bf29da4d2..3170dac364d2503ffaff43a60e17cad4ce399259 100644 --- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java +++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.enterprise; import android.content.Context; import android.content.pm.PackageManager; +import android.util.IconDrawableFactory; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.IconDrawableFactory; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java index 6e81482e10001595aefc563d1dd83f402116a900..45170b3842f810e63b9dffff0f7432519707c47d 100644 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java index 2d3f41a6d4f7ad90241b8483b2c52a9d82d44174..1bfe74724f309ad33e44b24695c6484ce1040ef7 100644 --- a/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsManagedProfilePreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.annotation.VisibleForTesting; public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase { diff --git a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java index 4220ccc546942c6df3750a34a0ac34f7ec38c0e7..c7dde5cc4625782e089b393edc1a968217e90bf2 100644 --- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java index 9e8574fcfb444a2a332bb4f62490476b582670b7..9bd4279db3f1ffb0037d365a709a06d5e0b826d2 100644 --- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java index e0c287df9e7fdf7209a5d7b9bb56f70b269470cb..b07eb9111438b185af0dd122b2244b9dd809cf2d 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index 876d706d4af6aef5dbc52bb5af3fd388c5fde925..e3136f4a5c1878cbe992c147c6b710f73d834abc 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -21,6 +21,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index 63a552d0ac2ae53202a8efc98b1031221f7209d3..b2f9459d8a3380d5a022c9c38916618ab5e09d4a 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.enterprise; import android.content.Context; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java index 2a2a94e704096f4fcec79198303603ff7bb4d91b..322589ea3f92da70bae2b1a689c5f7eb924bf16c 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java index fa4e7aa1a9a8e4f6ace67bd7cd38934495a2fe1a..51a24a2762070e2882a9bf1d2be8fb398144a1f3 100644 --- a/src/com/android/settings/enterprise/ImePreferenceController.java +++ b/src/com/android/settings/enterprise/ImePreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java index e4f2e76f7d199af6c7a8faff8d2b925a274b75e3..832e2ba8ce5ed87df7601425cd9e7aba9704f139 100644 --- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java +++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java @@ -14,6 +14,7 @@ package com.android.settings.enterprise; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java index f3c14865590febb2d714ab959a065bfa416b0ae0..b87e61f848115fba2fd90dc4b99fd4cd61a5d21b 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java @@ -17,9 +17,7 @@ package com.android.settings.fingerprint; import android.animation.Animator; -import android.animation.AnimatorListenerAdapter; import android.animation.ObjectAnimator; -import android.animation.ValueAnimator; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java index 95a534cdd426e231ec51e63f5800fff20fb76648..4800a4fd48b996f747ae10dbe6b5e16704e34625 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -20,10 +20,11 @@ import android.content.Intent; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.Nullable; import android.view.View; import android.widget.Button; +import androidx.annotation.Nullable; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java index 226d7185fb40af8e17c2476b522269715ef4ebf2..bca871343a2d18d041ac78c77b267acc061b3327 100644 --- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java +++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java @@ -24,12 +24,13 @@ import android.media.MediaPlayer; import android.media.MediaPlayer.OnInfoListener; import android.media.MediaPlayer.OnPreparedListener; import android.net.Uri; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Surface; import android.view.TextureView; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; /** diff --git a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java index 7caca3fff5771af8a9582c8c7bcc56d88f3881ae..ce679b66488fa448588a2b05b3690abfe3af3421 100644 --- a/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java +++ b/src/com/android/settings/fingerprint/FingerprintRemoveSidecar.java @@ -17,17 +17,18 @@ package com.android.settings.fingerprint; import android.annotation.Nullable; -import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.Bundle; -import com.android.settings.core.InstrumentedFragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import android.os.UserHandle; -import java.util.Queue; -import java.util.LinkedList; import android.util.Log; +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.core.InstrumentedFragment; + +import java.util.LinkedList; +import java.util.Queue; + /** * Sidecar fragment to handle the state around fingerprint removal. */ diff --git a/src/com/android/settings/fingerprint/FingerprintSettings.java b/src/com/android/settings/fingerprint/FingerprintSettings.java index ed691895e84f6704d7b25d4b7aab887b09e16793..8fccd66cf2b7d983c0b838829b873c1a171a1f74 100644 --- a/src/com/android/settings/fingerprint/FingerprintSettings.java +++ b/src/com/android/settings/fingerprint/FingerprintSettings.java @@ -31,12 +31,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -44,6 +38,13 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java index 519f116a0483286672d7d4fcfeacfd6dc8477019..aa1ddfb948ee738fade0e308e77792730a015ce7 100644 --- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java @@ -22,6 +22,7 @@ import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index 78dcb80afc0ae2830b4643dc0648917c15451cdb..fbf4309f25b39c04cc3c9b99fa87a74fe0ad5965 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -24,6 +24,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; + import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index badcb535471c17243cde659b4cdf80319a137140..de4867f572a7c7378d45154675fb8ded6de41548 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -29,12 +29,13 @@ import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java index a2ba9a961819d35c39a281c99f62e66f05a37cab..06f35266edd57162085a58af30dba77b6c0cca31 100644 --- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java @@ -37,12 +37,13 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.View; import android.webkit.IWebViewUpdateService; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.DeviceAdminAdd; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 7527db3acb1ccb0b819f5ce511a69f56df10f71c..26fd39851565bd29aa0fc0a249f3dfe01250341b 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java @@ -17,8 +17,9 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java index cd384f1fa242432ed066d3c7cd2e595379133782..7f74d9e439b8812b73486415ce8abd3f9f75a9c7 100644 --- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java @@ -18,6 +18,7 @@ import android.app.AppOpsManager; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 83b0984c7e9d6f71efc2b12fe1f2c5c104c3fd8c..6848ea88b0887fefa9193eba22cc8bafb08b1abd 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -27,24 +27,23 @@ import android.os.Message; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.ArrayMap; -import android.util.FeatureFlagUtils; import android.util.Log; import android.util.SparseArray; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper.DrainType; import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.PowerProfile; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.core.FeatureFlags; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index f07389de53bde68fc9f8258084a27a6d2d91356f..b5c39a1f697ae0c5f420ece36fa6d3597a6a8f4f 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -21,11 +21,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.PowerManager; + import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import com.android.settings.Utils; -import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/BatteryCellParser.java b/src/com/android/settings/fuelgauge/BatteryCellParser.java index 2b398778ca30ab108aad7908f233c24acf809104..9139084d52e0a9873d62afad878ec5802d1e2a11 100644 --- a/src/com/android/settings/fuelgauge/BatteryCellParser.java +++ b/src/com/android/settings/fuelgauge/BatteryCellParser.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import android.os.BatteryStats.HistoryItem; import android.telephony.ServiceState; import android.util.SparseIntArray; + import com.android.settings.Utils; import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider; diff --git a/src/com/android/settings/fuelgauge/BatteryFlagParser.java b/src/com/android/settings/fuelgauge/BatteryFlagParser.java index d4f3fb20fd483e1a5d6fd668956eda41330e98b6..e16d5e7633f7e564f9cfd88b442a7e851ce208cf 100644 --- a/src/com/android/settings/fuelgauge/BatteryFlagParser.java +++ b/src/com/android/settings/fuelgauge/BatteryFlagParser.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import android.os.BatteryStats.HistoryItem; import android.util.SparseBooleanArray; import android.util.SparseIntArray; + import com.android.settings.fuelgauge.BatteryActiveView.BatteryActiveProvider; public class BatteryFlagParser implements BatteryInfo.BatteryDataParser, BatteryActiveProvider { diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java index 7038fade345c94904bbae18bc66fad89f70b9553..1695e40b901b6b6b75cad9a9ed5cf82ac9262496 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -22,10 +22,11 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; +import android.widget.TextView; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java index 3661467887b290cc30ae5560454ccdd59ee9d971..f7d62473dc499f683cf24d3d004cece51d80db74 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryDetail.java @@ -25,6 +25,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java index 6ef09570b6ed5da84c8e202768f9387a3673fc87..4193cb9a131e57e307bdcf97ff2f23902919dd29 100644 --- a/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java +++ b/src/com/android/settings/fuelgauge/BatteryHistoryPreference.java @@ -17,12 +17,14 @@ package com.android.settings.fuelgauge; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java index 9afaabad3952758fdbab4c8110d172be82ec30f4..7d0c7989602e4d31324cb207a237bad048299e10 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfo.java +++ b/src/com/android/settings/fuelgauge/BatteryInfo.java @@ -24,10 +24,11 @@ import android.os.BatteryStats; import android.os.BatteryStats.HistoryItem; import android.os.Bundle; import android.os.SystemClock; -import androidx.annotation.WorkerThread; import android.text.format.Formatter; import android.util.SparseIntArray; +import androidx.annotation.WorkerThread; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.Utils; import com.android.settings.graph.UsageView; diff --git a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java index c60f42314f776f25fbb325eeccfb942ffa8c7df9..22efaf6dec7cc73f8d78f97b513ee24adca48445 100644 --- a/src/com/android/settings/fuelgauge/BatteryInfoLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryInfoLoader.java @@ -17,11 +17,10 @@ package com.android.settings.fuelgauge; import android.content.Context; +import com.android.internal.annotations.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; import com.android.settingslib.utils.AsyncLoader; -import com.android.internal.annotations.VisibleForTesting; - /** * Loader that can be used by classes to load BatteryInfo in a background thread. This loader will * automatically grab enhanced battery estimates if available or fall back to the system estimate diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java index 0ad3724c906fafa576a53fed4729b0e190fe383e..5ad24003096b9775fbdacbb0082dba667e9128c7 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -22,10 +22,11 @@ import android.graphics.Color; import android.graphics.ColorFilter; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.graph.BatteryMeterDrawableBase; diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java index b010998befd6075e4d82ef7078e75135f68b9f74..6d2f1247027f3964cc898bde55a3a59a817f9fb6 100644 --- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java @@ -15,6 +15,7 @@ package com.android.settings.fuelgauge; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index 8b32a9cca1bf5b91e21d2172b11f1a918e4816fe..2b4e91508ddb0424ba4c4e2b9e5dcb4437d8381e 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -21,6 +21,7 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java index addd30945c5024d2dabd4d546c90d3ef411717a9..c71478339ecb9f6f051dde21a2b7a27d52ea8310 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java @@ -17,9 +17,8 @@ package com.android.settings.fuelgauge; import android.content.Context; -import android.os.BatteryStats; -import android.os.Bundle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java index 4a3e6d42e889987260de1a0ca9948019102d096f..68cdf6c346e05800ba2ba354972df5d2a5ed6337 100644 --- a/src/com/android/settings/fuelgauge/BatteryUtils.java +++ b/src/com/android/settings/fuelgauge/BatteryUtils.java @@ -24,21 +24,21 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.BatteryStats; -import android.os.Bundle; import android.os.Build; +import android.os.Bundle; import android.os.Process; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; +import android.text.format.DateUtils; +import android.util.Log; +import android.util.SparseLongArray; + import androidx.annotation.IntDef; import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; -import android.text.TextUtils; -import android.text.format.DateUtils; -import android.util.Log; -import android.util.SparseLongArray; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -48,7 +48,6 @@ import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; import com.android.settings.fuelgauge.batterytip.StatsManagerConfig; import com.android.settings.overlay.FeatureFactory; - import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import com.android.settingslib.utils.PowerUtil; diff --git a/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java b/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java index f4784a97824ac3d377c4bdac24f3412f7e5c41a2..3a6e4eb01dacc29fe1703a949fceeec417e500e2 100644 --- a/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java +++ b/src/com/android/settings/fuelgauge/ButtonActionDialogFragment.java @@ -1,11 +1,11 @@ package com.android.settings.fuelgauge; -import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; + import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java index 784902fca79a2dea744426dcaca16a1f5c513182..f58ad9608189f0cc8291b1885c93da46f3288ffc 100644 --- a/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java +++ b/src/com/android/settings/fuelgauge/DebugEstimatesLoader.java @@ -20,10 +20,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryStats; import android.os.SystemClock; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.utils.PowerUtil; import com.android.settingslib.utils.AsyncLoader; +import com.android.settingslib.utils.PowerUtil; + import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java index f93cffc1f4bb2bfcbb310f8496bfa216ed7aeaad..cb419ca253b63934d5cbe46203482a86bdf644c5 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -30,15 +30,14 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.os.Bundle; + import androidx.preference.ListPreference; import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceGroup; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; -import com.android.settings.widget.RadioButtonPreference; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java index 95ff45c922817bf20842d312fdc0770dac856f06..a2ceb67cab788258e56805f64168980cd158698e 100644 --- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java +++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java @@ -19,10 +19,11 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.AppPreference; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index b73245733e3fdff008603d1acf04d14f91a3fd89..a793aed64ad7ca8fda5aa22f63f5dec2ca757f84 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -21,11 +21,12 @@ import android.content.IntentFilter; import android.os.BatteryManager; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java index cd34a477a62b41c77c6dc885232fbd760c3e1cd7..8c7bfbc429afafe4839550528d813b83365b61a8 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java @@ -21,9 +21,10 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; +import android.util.IconDrawableFactory; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java index aa029191a86ad012b146562335d73301ad450483..52f786acdfb5a6371469fe95766973c0b9604496 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageBase.java +++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java @@ -15,7 +15,7 @@ */ package com.android.settings.fuelgauge; -import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.*; +import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import android.app.Activity; import android.app.LoaderManager; @@ -23,9 +23,10 @@ import android.content.Context; import android.content.Loader; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.view.Menu; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index c8daf726c843fd68886239fbf890c4f9802ed606..315d62741dccbf8a761fd6cebfa02783b690214c 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -26,7 +26,6 @@ import android.content.Loader; import android.os.BatteryStats; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.text.format.Formatter; import android.util.SparseArray; @@ -37,6 +36,8 @@ import android.view.View; import android.view.View.OnLongClickListener; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index f282154b66934ae9900f67fc56080af892236dd7..d3c1d54e1af730ff1cda0196b4ff2cca526cb81f 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -19,13 +19,12 @@ package com.android.settings.fuelgauge; import android.app.AppOpsManager; import android.content.Context; -import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index b89824bf08374a9aba51405d7f4995002be0a3a4..4491155d7162e1c355a86e7d4e25ceeb168d2f90 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -21,10 +21,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; +import android.util.IconDrawableFactory; + import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index a3afd459ae80f0411c07097c64a124c42643c6fa..af49f3d9541d942ef43ad6caba188a2fe3a68a46 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java index edbc14f5fb603e38a7c78a7d63518f7e08c7ce11..801b28fd1a24471e6870273af097a03a08f5d261 100644 --- a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java +++ b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java @@ -18,9 +18,10 @@ package com.android.settings.fuelgauge.anomaly; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.IntDef; import android.text.TextUtils; +import androidx.annotation.IntDef; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Objects; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java index 55d972157b24d67710be89a6944cd245c7b6babf..166095d94929fedfe89830987e187dacf832e6a1 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java @@ -19,11 +19,12 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; import android.net.Uri; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.KeyValueListParser; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java index 918f98af50e06bfee6566271bd73f30b1b371196..440a81f5204ba57e323e3f5293fd6ee9e36c058e 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java @@ -21,6 +21,7 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java index fbd7dedf05a8104bf9fe20cf3d55fdbe2fe2d3a4..97d67040766e84b75880eb4b40bc42db6a52b931 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java @@ -21,15 +21,13 @@ import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatteryStatsHelper; -import com.android.internal.util.ArrayUtils; import com.android.settingslib.utils.AsyncLoader; -import java.io.FileDescriptor; -import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java index a54b02ec3d86a7b398f05a65a26d26bcc38caf87..ba061473049d1236eafd0e9c51d7a5429fbbdf48 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyPreference.java @@ -1,9 +1,8 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; -import androidx.preference.Preference; -import com.android.settings.R; +import androidx.preference.Preference; /** * Preference that stores {@link Anomaly} diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java index dd90d89949b686dd7732593b569c37da2c8dae33..a78576fc8dbacc7e3487806463fdfbcd0a1ed9a0 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java index 2926547237d163fe382ec1a016809047551d4775..f9891b34449d9e61563f06039d1588fd8356993e 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java @@ -18,10 +18,11 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.util.Pair; import android.util.SparseIntArray; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java index e3666d8f14c7312200299bb8d1604e8062de549f..0519ea1d6ed1e25d710d370c5a79e2e14e10622b 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.anomaly.action; import android.app.AppOpsManager; import android.content.Context; import android.os.Build; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java index dcf7e46fda55de25f53c96444abd0c8a9bdeb2a9..5a93c5151c621b837415537e0a1752fe3a5d1899 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.anomaly.action; import android.Manifest; import android.content.Context; import android.content.pm.permission.RuntimePermissionPresenter; + import androidx.annotation.VisibleForTesting; import androidx.core.content.PermissionChecker; diff --git a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java index b5fd20b5caa16c99991663f03e5ceaba39efc88c..e9e31e3f2b617c49590bf4a7eac5a140bcc298e7 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import android.content.Context; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java index 5cb188a220a5e93a108982cf65ee2410a70bde2e..b65279bdc733e229cd1c008286057b9b4d59a284 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java @@ -19,9 +19,8 @@ package com.android.settings.fuelgauge.anomaly.checker; import android.content.Context; import android.os.BatteryStats; import android.os.SystemClock; + import androidx.annotation.VisibleForTesting; -import android.text.format.DateUtils; -import android.util.ArrayMap; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -30,7 +29,6 @@ import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyUtils; -import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; import java.util.ArrayList; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java index 73d092517a1ffe0bdd8db0d335cf212efc860616..8b9e5d57776c2a12035b542e9a9eb04664f7b99e 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.SystemClock; + import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatterySipper; diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java index f891b514868d0a6a21b09369c1ab6c0d4fc20513..3becba124a94d8d60d7fda9dad356f27b50b8f4a 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java @@ -18,11 +18,10 @@ package com.android.settings.fuelgauge.anomaly.checker; import android.content.Context; import android.os.BatteryStats; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import android.util.ArrayMap; -import android.util.ArraySet; -import android.util.Log; + +import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -33,7 +32,6 @@ import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java index 06c05c075d5f616e455847e65f98cb134d5259d6..c0ecbf9fb294af7b5a17d869db0de39d2a6df70e 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java index b082eeb52f93c0141ee6093e565727ef88634f5c..c824dbb450c7c8767aa2f9b58b668fbadb6da07d 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java @@ -22,11 +22,12 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; +import android.util.Log; +import android.view.accessibility.AccessibilityNodeInfo; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.view.accessibility.AccessibilityNodeInfo; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java index 0618b44bdf1ea6d1dd817919126c0326c470f3a9..80a72e67f71f33222ad138931d42dfd27a1dbe14 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.os.PowerManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java index 331572ba6114dcfb194a12a4dffdcda03889a24a..bb73142b9be0c5650d54797ca1d9fddf2e357080 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java @@ -22,9 +22,10 @@ import android.app.job.JobScheduler; import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java index 44169f0bfe62ef25b33cf8b51f0a57587e612dd6..ad02c3a75b699777a755237d8d7041a13e19a070 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java @@ -25,11 +25,12 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Base64; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.utils.ThreadUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java index 8e224470221ee2318b0de852cb9f43b8e5f94097..369e61382db1013ac3ee5edede2a8df4e6605241 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigReceiver.java @@ -16,15 +16,12 @@ package com.android.settings.fuelgauge.batterytip; -import android.app.PendingIntent; import android.app.StatsManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; -import com.android.internal.annotations.VisibleForTesting; - /** * Receive broadcast when {@link StatsManager} restart, then check the anomaly config and * prepare info for {@link StatsManager} diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java index 404d8d7a889b7d05aa9d130feaef759a646c743c..e7f654c6ec545726aec48ae5f570edbe06e4b65c 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java @@ -19,9 +19,10 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import androidx.annotation.IntDef; import android.util.Log; +import androidx.annotation.IntDef; + import com.android.settings.fuelgauge.anomaly.Anomaly; import java.lang.annotation.Retention; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index ad63fd21ad6794481e25d94041cbd7a7222358e1..9f28cc3dddafe950dd22f56863bed96fd492d035 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -34,11 +34,12 @@ import android.os.Bundle; import android.os.StatsDimensionsValue; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.GuardedBy; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.util.Pair; +import androidx.annotation.GuardedBy; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.ArrayUtils; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java index 4128f9dc487d2effa31ab3917d4d4fd76e7c02e8..7ec33062243115f2086a6cf6c7cef24bf6ff8e2f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java +++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java @@ -18,10 +18,11 @@ package com.android.settings.fuelgauge.batterytip; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.anomaly.Anomaly; import java.util.Objects; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java index 8edc45e338ad79667df3566d715264599fb355ef..fe0fd180f56d0cd236edd4c5435fd9cd2105c70d 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java @@ -20,6 +20,7 @@ import android.app.AppOpsManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index 5cd52775ec06f151307b74b134c81c485cfbb6cf..00064869044bb08757fcd655b0c7d202e3f58269 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -21,10 +21,11 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; +import android.view.LayoutInflater; + import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.LayoutInflater; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -32,15 +33,12 @@ import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; -import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController.BatteryTipListener; import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; -import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; -import com.android.settingslib.utils.StringUtil; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java index c445687b20f3f8e497515d8f7e5505bad05aab28..1742a05aac4eb3ae07e962483adae250520f249f 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; + import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; @@ -26,8 +27,8 @@ import com.android.settings.fuelgauge.Estimate; import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector; import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector; import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector; -import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector; import com.android.settings.fuelgauge.batterytip.detectors.RestrictAppDetector; +import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector; import com.android.settings.fuelgauge.batterytip.detectors.SummaryDetector; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java index 42e723d23966cceb43375380a6634f39b4c6b6f1..93234a7873bfb392bc38afd26656c57c6fbd12c1 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.util.KeyValueListParser; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.time.Duration; -import java.util.concurrent.TimeUnit; /** * Class to store the policy for battery tips, which comes from diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java index 21fc132259d834b8e26c369f46484954f4e3c48f..8e407f148d4000d3082d4aadae854ccff498fc80 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -18,12 +18,12 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import com.android.internal.logging.nano.MetricsProto; import com.android.settings.SettingsActivity; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -34,7 +34,6 @@ import com.android.settings.fuelgauge.batterytip.tips.SummaryTip; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java index da2d81f1ff412770861bac74748d57859508f8c4..16a9de9222110ef44c386fec999137c97e218d7a 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java @@ -23,6 +23,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.NonNull; import com.android.internal.util.CollectionUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java index b1866b9d2228050128fe15f2086cf283f1d8031d..d832640736a7bf49cef56199bf7eefbbf282f594 100644 --- a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java +++ b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.recyclerview.widget.RecyclerView; import android.util.IconDrawableFactory; import android.view.LayoutInflater; import android.view.View; @@ -27,10 +26,12 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.Utils; - import com.android.settingslib.utils.StringUtil; + import java.util.List; /** diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java index 4a0b5ba01fb779666ab6469cc9b2a115bf6d8ffe..230be3636fe7203990a81acf3a49c3411bb7780b 100644 --- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java +++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java @@ -18,9 +18,6 @@ package com.android.settings.fuelgauge.batterytip; import androidx.annotation.IntDef; -import com.google.common.hash.HashFunction; -import com.google.common.hash.Hashing; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java index 9f9a99d0f5821955a56fcd048ec7f80721763dcf..236413eb844bc5c7bae13a455a4a2f730280cc6b 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenBatterySaverAction.java @@ -19,17 +19,8 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; -import com.android.settings.SettingsActivity; -import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.SubSettingLauncher; -import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.fuelgauge.RestrictedAppDetails; import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; -import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; - -import java.util.List; /** * diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java index 59b5c15b0556589147705d55fc96e617b257c0cc..ac946df571d476aff7e6141502a3ceee2fe279b6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java @@ -18,9 +18,10 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.util.CollectionUtils; import com.android.settings.fuelgauge.BatteryUtils; diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java index ea40107d62edd08bd10a9e99417ce3be1e41e0a6..419e04313451cdfa1f3e152972f11928a65a0883 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java @@ -18,9 +18,10 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Pair; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java index 664a8ca202e9786a29d2db69433b7414189d8012..13ba5f6bcfe9e8d7423e7a6c718cf59ab60b74b5 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java @@ -18,15 +18,16 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; import android.os.BatteryStats; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; +import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; -import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.AppInfo; -import com.android.settings.fuelgauge.BatteryInfo; +import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.HighUsageDataParser; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip; diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java index 3ff0989d08af049d99f10e0f7fe11626408de1df..80e1af129d20341d36e4aac7c3a0d02c7dcd88bf 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java @@ -17,9 +17,10 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryDatabaseManager; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java index 21bdbf10816b2818a1eedb17d03f9816f67f800e..3650fe38e2c8ea040ee2f8758b4734c41b848dbd 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/AppRestrictionPredicate.java @@ -19,7 +19,6 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.app.AppOpsManager; import android.content.Context; -import com.android.settings.Utils; import com.android.settings.fuelgauge.batterytip.AppInfo; import java.util.function.Predicate; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java index b1a0d7c6b24200dab904c8f0641195d72e6359c1..21af43249e97408cffa4a3f1a90e73ac4123f963 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -19,11 +19,12 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; +import android.util.SparseIntArray; + import androidx.annotation.IdRes; import androidx.annotation.IntDef; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.util.SparseIntArray; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java index 2b8ad231c10e9d4bf40c18433e97e66559a6f5bb..356097dfbda03271078b18c538775edd3ceef179 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java @@ -19,12 +19,12 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; - import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.List; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index c2e45b19c48a4bc54b6659c9967bc57ae75cff69..818a46757dfd74f6dead1f36c1796f6e59689945 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Resources; import android.icu.text.ListFormatter; import android.os.Parcel; -import android.text.TextUtils; import android.util.Pair; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java index 68c7d70be5ef467022d5e484748317059fe61793..e8dc6a9e7897211acd1de3d454cd56781ca00cb0 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SmartBatteryTip.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; -import android.provider.Settings; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java index 8d0624aa965d88d84ccc3b58201ba4113f6faa48..0e2e8b59ffaaf9fc8bfc1353568579b6ce4718e6 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -19,6 +19,7 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java index 187b1cabb4ad4d20075ac6f85519574353951994..11c6b2253954b68333cca41c73d50438d037f1fd 100644 --- a/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java +++ b/src/com/android/settings/gestures/AssistGestureFeatureProviderImpl.java @@ -18,7 +18,6 @@ package com.android.settings.gestures; import android.content.Context; -import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java index 6e318d65b2eaaf86a46b8f598c5d4cd785a21f37..4a5ab1ab6e06ab16d2e27b6676590b75619f8278 100644 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java @@ -22,6 +22,7 @@ import static android.provider.Settings.Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENA import android.content.Context; import android.content.Intent; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 4433dd6e29e9084a60d73f21d4e1bec9a6601377..95810a80bf4879085ac1f8e679518aa0e6c7c67d 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -22,9 +22,10 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index f1c2ed30c2ae5fac60dc1fc2bd8138970b8c5a12..b9edbf48d8104138ce21de9ab11fc64690019d49 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -16,24 +16,24 @@ package com.android.settings.gestures; +import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP; + import android.annotation.UserIdInt; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; -import static android.provider.Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP; - public class DoubleTapScreenPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index 29e0a1a4b7365de22b3ea643c20bb2a49da252ad..8614b11f3e669b2223d34fea38e25a246363fda6 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -18,7 +18,6 @@ package com.android.settings.gestures; import android.content.Context; import android.content.SharedPreferences; -import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.hardware.AmbientDisplayConfiguration; @@ -29,7 +28,6 @@ import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index 6a72dc4e4d7c6a7d9a4612e2cef3f927813881b1..d4c63c0a76bf2f5796d86deaad07618d71e19c28 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -24,9 +24,10 @@ import android.hardware.SensorManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index 780325f085733210554f815875e91ecf86c3c403..a4274bf7417939e4bc4acb33b3ae283386ca7b7c 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.gestures; import android.content.Context; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index 27172d95b1f165dbc38377e9effb0bd636bd7369..26ec87d8013ff8eb15eed181e01270ddd8665d59 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -17,20 +17,14 @@ package com.android.settings.gestures; import android.content.Context; -import android.os.UserHandle; import android.provider.SearchIndexableResource; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java index 652e1518188e0bb8bf63f6352e13f5fcf95212b0..d0cdfb7039cd15e01707e750b18e21eff3585598 100644 --- a/src/com/android/settings/gestures/GesturesSettingPreferenceController.java +++ b/src/com/android/settings/gestures/GesturesSettingPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.gestures; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.annotation.NonNull; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index 6d01e52e84292c04bf48d66101e7a55d0ff1c8b7..c76811c457a860b975bcaade25fe571ae28bc994 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -24,9 +24,10 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.UserHandle; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 09570dfb4f5c5edc953b833782bc175b77a9a79b..11eb84ce45115047ca969c4da5809c460af5cd16 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -17,17 +17,13 @@ package com.android.settings.gestures; import android.content.Context; -import android.os.UserHandle; import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.search.BaseSearchIndexProvider; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settingslib.core.lifecycle.Lifecycle; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/PreventRingingPreferenceController.java b/src/com/android/settings/gestures/PreventRingingPreferenceController.java index c6bc3aa8f265c649c61219befb65c0339719ea09..29269234dc1db91c2b882fde7c9608753d550f6d 100644 --- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java @@ -24,6 +24,7 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; import android.content.Context; import android.os.Bundle; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/gestures/SwipeUpPreferenceController.java b/src/com/android/settings/gestures/SwipeUpPreferenceController.java index 331a5efbaf1a4548d550702ab3b6b0a136dc0c5b..f48d21b90d4097562dccbafa2faded0bba34348b 100644 --- a/src/com/android/settings/gestures/SwipeUpPreferenceController.java +++ b/src/com/android/settings/gestures/SwipeUpPreferenceController.java @@ -22,7 +22,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import com.android.internal.R; diff --git a/src/com/android/settings/graph/BottomLabelLayout.java b/src/com/android/settings/graph/BottomLabelLayout.java index 20d97e5e4d0e410b2fe8606cd03ae5146d6fec84..d68fa2fc9431dd7d20ec8861c31ffefcacd1d39c 100644 --- a/src/com/android/settings/graph/BottomLabelLayout.java +++ b/src/com/android/settings/graph/BottomLabelLayout.java @@ -19,12 +19,13 @@ package com.android.settings.graph; import android.annotation.Nullable; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; + import com.android.settingslib.R; /** diff --git a/src/com/android/settings/graph/UsageGraph.java b/src/com/android/settings/graph/UsageGraph.java index b9d517d5e8d11b2c0620954e807b687bd6349f65..51e0270f7e2b84f4aa2f126d8d2deff3ebd94bca 100644 --- a/src/com/android/settings/graph/UsageGraph.java +++ b/src/com/android/settings/graph/UsageGraph.java @@ -28,12 +28,13 @@ import android.graphics.Paint.Style; import android.graphics.Path; import android.graphics.Shader.TileMode; import android.graphics.drawable.Drawable; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.util.SparseIntArray; import android.util.TypedValue; import android.view.View; +import androidx.annotation.VisibleForTesting; + import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.R; diff --git a/src/com/android/settings/graph/UsageView.java b/src/com/android/settings/graph/UsageView.java index bcf04414cfe4ae2b325735e8c1860dba0ad0091e..8297d0b0bed46813d251af9f88a89982f5ddd1ba 100644 --- a/src/com/android/settings/graph/UsageView.java +++ b/src/com/android/settings/graph/UsageView.java @@ -24,6 +24,7 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; + import com.android.settingslib.R; public class UsageView extends FrameLayout { diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index a635842aa4c6cf38d6582c193ef0e1dd69e00888..80f668069f103dacb13fdc7b9225b135114552a2 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; import android.provider.Settings; +import android.view.InputDevice; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.view.InputDevice; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java index 37f64133915177a5db30e76dc27cd083346f401c..be54ee2332924b4f0366a1cc3b8548adc8146260 100644 --- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java +++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java @@ -18,9 +18,10 @@ package com.android.settings.inputmethod; import android.content.Intent; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManager; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java index e100dd2dc96a3388af046d0a17d78c75259f7646..62c0470eddb9b30e4393367265a087c2cdf21e9a 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java @@ -19,7 +19,6 @@ package com.android.settings.inputmethod; import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.app.LoaderManager.LoaderCallbacks; import android.content.AsyncTaskLoader; import android.content.Context; diff --git a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java index 47625e768bf464970154f46ecc2d542ede18d6d7..a455b3c7d29437955d6964d97a25e5162abe6891 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerFragment.java @@ -22,10 +22,11 @@ import android.hardware.input.InputManager; import android.hardware.input.InputManager.InputDeviceListener; import android.hardware.input.KeyboardLayout; import android.os.Bundle; +import android.view.InputDevice; + import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.view.InputDevice; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index cc2e8aa82fefc1db50307d83ce2b7d1cf046219e..532ad15065ae94707fce248c58caeaaca60b138e 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -30,13 +30,14 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings.Secure; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.view.InputDevice; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.view.InputDevice; +import androidx.preference.SwitchPreference; import com.android.internal.inputmethod.InputMethodUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index 38937de3b8eef8e26be9add7a51a83743bc6d062..78f4d347b70f0318bdcd543793250ce52be37354 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 62874266bf38bd3180a39515c13d32955a044ca2..88649ec249cbf73ded022db4711d2c55730e3176 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -21,12 +21,13 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; import android.view.View.OnClickListener; import android.view.textservice.SpellCheckerInfo; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.CustomListPreference; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java index 8adf2389770d37c5e8a7e82de9f8a13aa2bc2090..a7ebd07598f6702230db7c12c506b039aa0e89ec 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.inputmethod; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 3f38704de6ed3c461f02bc46491d65498ddfb629..20ec6f8190896a622212e88db3a3aed3cb7f32c7 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -22,16 +22,17 @@ import android.content.DialogInterface; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.SpellCheckerSubtype; import android.view.textservice.TextServicesManager; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java index 3f1122a58ce6a0549065dcb562604395f9473e67..9ec10785eb7bc1d30671a1be5fb6cc44670e83b4 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java +++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java @@ -21,9 +21,10 @@ import android.content.CursorLoader; import android.database.Cursor; import android.database.MatrixCursor; import android.provider.UserDictionary; -import androidx.annotation.VisibleForTesting; import android.util.ArraySet; +import androidx.annotation.VisibleForTesting; + import java.util.Locale; import java.util.Objects; import java.util.Set; diff --git a/src/com/android/settings/inputmethod/UserDictionaryList.java b/src/com/android/settings/inputmethod/UserDictionaryList.java index 990c12bcdb7ffdc77922c9916a59342d852997ad..916e55419f1fb35262b91034a6ba8a8b45369941 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryList.java +++ b/src/com/android/settings/inputmethod/UserDictionaryList.java @@ -22,14 +22,15 @@ import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.provider.UserDictionary; -import androidx.annotation.NonNull; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodSubtype; +import androidx.annotation.NonNull; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index bd33b3ff4c91b3e3336be95c21e7b22dcd6dff98..585ce194b22ff0fab5a4750ec4f3051706e6b648 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -24,10 +24,11 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.preference.Preference; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.Preconditions; import com.android.settings.R; diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java index 4a046469d9d48ae844cf6a8e5bac8565f92cc74a..0f5a49ea2bc11783dd9d5e2f27af6d49a505c4d3 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java @@ -19,11 +19,12 @@ package com.android.settings.inputmethod; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.pm.PackageManager; -import androidx.preference.Preference; import android.text.BidiFormatter; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 7e7bdcaecd94f43ad2e426b9012ed84623fd228f..7e04023a79f2de0b97c9713cb16177aca143b1f3 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -24,12 +24,13 @@ import android.content.pm.PackageManager; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.speech.tts.TtsEngines; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController; diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index af60ba0fa44acd001193d0d75b6e1f8731c12c51..c0aedfeaede9c91a6d3db92ba3e4a822180e1290 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.language; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java index 8a0226a20d1b4349d5167bce8f5530e9138c7992..67326ddab0e6fdf2689caa063fecad007ead8367 100644 --- a/src/com/android/settings/language/PointerSpeedController.java +++ b/src/com/android/settings/language/PointerSpeedController.java @@ -18,11 +18,11 @@ package com.android.settings.language; import android.content.Context; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + public class PointerSpeedController extends BasePreferenceController { diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java index f19047b5b88b0a23b4a809d5a890f2ae83f52a62..c83492c4883d0b8aee5aa9bef5ba0677b910dde2 100644 --- a/src/com/android/settings/language/TtsPreferenceController.java +++ b/src/com/android/settings/language/TtsPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.language; import android.content.Context; import android.speech.tts.TtsEngines; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; public class TtsPreferenceController extends AbstractPreferenceController diff --git a/src/com/android/settings/language/UserDictionaryPreferenceController.java b/src/com/android/settings/language/UserDictionaryPreferenceController.java index 9338a296da9d905858ee3152c1914252de69a566..f2c55c43da31b676db66628b1579a050bd833f97 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.language; import android.app.Fragment; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index be6447ef1950d5de9eba8301d5aff139474bb624..af7dc7613dc17e9b140d6d50e69570676bc898cf 100644 --- a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java +++ b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java @@ -20,9 +20,6 @@ import android.content.Context; import android.graphics.Canvas; import android.os.Bundle; import android.os.LocaleList; -import androidx.core.view.MotionEventCompat; -import androidx.recyclerview.widget.RecyclerView; -import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.util.TypedValue; import android.view.LayoutInflater; @@ -31,11 +28,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.CompoundButton; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.app.LocalePicker; import com.android.internal.app.LocaleStore; - -import com.android.settings.shortcut.CreateShortcut; import com.android.settings.R; +import com.android.settings.shortcut.CreateShortcut; import java.text.NumberFormat; import java.util.ArrayList; diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java index d3d58ff73e535bb0e007aef23dc3e041438b1241..90698129ccc34456f0bd9a30a3e5ab51e9e2e90b 100644 --- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java +++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java @@ -18,10 +18,11 @@ package com.android.settings.localepicker; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settings.R; diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index de68f00e318e31693c0fa6708bf604da7aac0610..ffb8cae467d897cee6bfa46743d630c47dad6332 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -16,20 +16,23 @@ package com.android.settings.localepicker; +import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; + import android.app.AlertDialog; import android.app.FragmentTransaction; import android.content.DialogInterface; import android.os.Bundle; import android.os.LocaleList; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; - import android.widget.TextView; + +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocaleStore; @@ -41,8 +44,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; - /** * Drag-and-drop editor for the user-ordered locale lists. */ diff --git a/src/com/android/settings/localepicker/LocaleRecyclerView.java b/src/com/android/settings/localepicker/LocaleRecyclerView.java index 93d54a49a8f586e6ea6933077fa82936116ea114..e82874dab70f782e5e993db4ebb8e6009b2091ae 100644 --- a/src/com/android/settings/localepicker/LocaleRecyclerView.java +++ b/src/com/android/settings/localepicker/LocaleRecyclerView.java @@ -17,10 +17,11 @@ package com.android.settings.localepicker; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; +import androidx.recyclerview.widget.RecyclerView; + class LocaleRecyclerView extends RecyclerView { public LocaleRecyclerView(Context context) { super(context); diff --git a/src/com/android/settings/location/BluetoothScanningPreferenceController.java b/src/com/android/settings/location/BluetoothScanningPreferenceController.java index 6350ffa49f1cfd7df5995b020cc7981a8ef0880a..d16e1e58e2f17e8b4cb51705b163dd563530acc1 100644 --- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java index d45128cea3d3ff22fe2eeba935dd5e9cb40d38fb..65de6e2339d6b528050ae903baaab1dbfcab95eb 100644 --- a/src/com/android/settings/location/LocationEnabler.java +++ b/src/com/android/settings/location/LocationEnabler.java @@ -13,8 +13,11 @@ */ package com.android.settings.location; +import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; +import static com.android.settingslib.Utils.updateLocationEnabled; +import static com.android.settingslib.Utils.updateLocationMode; + import android.app.ActivityManager; -import android.Manifest.permission; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -23,9 +26,10 @@ import android.location.LocationManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -33,10 +37,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static com.android.settingslib.Utils.updateLocationMode; -import static com.android.settingslib.Utils.updateLocationEnabled; -import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; - /** * A class that listens to location settings change and modifies location settings diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java index 658c3cd45206814f3ed8ab750864f5185afb6fdf..3431aa25c05818da6d0c0b323710cc4e6337bca4 100644 --- a/src/com/android/settings/location/LocationFooterPreferenceController.java +++ b/src/com/android/settings/location/LocationFooterPreferenceController.java @@ -22,14 +22,17 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.location.LocationManager; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; -import android.util.Log; + import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.widget.FooterPreference; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java index 3f51d6f4db5cdbdef616abfb087ad712c07fa0a4..580f8880f93e30422c430cb1b7334620a59740f5 100644 --- a/src/com/android/settings/location/LocationForWorkPreferenceController.java +++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.location; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java index a091ca82b0150b9d53b5e94f94c5c352fb330d3d..bc39b19e1a737d25a06efab0708a8e2c9c47e5d0 100644 --- a/src/com/android/settings/location/LocationPreferenceController.java +++ b/src/com/android/settings/location/LocationPreferenceController.java @@ -21,15 +21,17 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings.Secure; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineListPayload; import com.android.settings.search.ResultPayload; +import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 33fe612913a23e318dde7004f478be97e188781a..9d1bdc0dc86def4b1e244a4ccd751728a9408f48 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.location; import android.content.Context; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.R; - import androidx.annotation.VisibleForTesting; +import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; + public class LocationScanningPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java index f865b449041d56e0648a191e7169253366547efe..cc5e53d082296ffa37ccc585aa1d355cffdf56df 100644 --- a/src/com/android/settings/location/LocationServicePreferenceController.java +++ b/src/com/android/settings/location/LocationServicePreferenceController.java @@ -19,11 +19,12 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.SettingInjectorService; import android.os.UserHandle; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 8b0ee8a496bba0e9ccceafb1c8726b701e06fb48..2d3911bbe914ac56295640145f8bb727283728e1 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -21,8 +21,10 @@ import android.content.Context; import android.location.SettingInjectorService; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -34,6 +36,7 @@ import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java index 160d90a6390063b2b72f821e2ab820fe23c6985a..c2f2adfb38ab7e41e18bc2ba60e8bcf6d570b2ea 100644 --- a/src/com/android/settings/location/LocationSliceBuilder.java +++ b/src/com/android/settings/location/LocationSliceBuilder.java @@ -29,18 +29,17 @@ import android.content.Intent; import android.net.Uri; import android.provider.SettingsSlicesContract; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - -import androidx.core.graphics.drawable.IconCompat; - /** * Utility class to build an intent-based Location Slice. */ diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java index 70ecc1eb850e957ffd077603a16a42a61caba57c..7aa66ce20497ea27bca8fcebdd7e4d4f5c0b0302 100644 --- a/src/com/android/settings/location/LocationSwitchBarController.java +++ b/src/com/android/settings/location/LocationSwitchBarController.java @@ -16,6 +16,7 @@ package com.android.settings.location; import android.content.Context; import android.os.UserHandle; import android.widget.Switch; + import com.android.settings.widget.SwitchBar; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java index f4ae15bdc54691cbbdaef10db6519eb98a8eda70..a41aa945d20f6c01c316066e858009198ef7d9fb 100644 --- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java @@ -16,10 +16,12 @@ package com.android.settings.location; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.core.SubSettingLauncher; @@ -27,6 +29,7 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.List; public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController { diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index 0b7614c22be2cc9a592916bd0421e183f12eb25a..1a11d92933d31aa478e8f80305750b83a1d67034 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java @@ -19,6 +19,7 @@ package com.android.settings.location; import android.content.Context; import android.provider.SearchIndexableResource; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -26,6 +27,7 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java index 99dc9fc348715d87e5933f93d6b51fc5859bfecc..6a1ebd938f1eb99561b7085e6b5023aa0d4e3ddd 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java @@ -17,13 +17,16 @@ package com.android.settings.location; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; + import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.List; /** Preference controller for preference category displaying all recent location requests. */ diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index 52b06564f759e04f07fd0a112dda1c06a2df54bb..1144e8f0ab785225bbad8c248b7def8e2a42a1d2 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -37,13 +37,14 @@ import android.os.Messenger; import android.os.SystemClock; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.AttributeSet; import android.util.IconDrawableFactory; import android.util.Log; import android.util.Xml; +import androidx.preference.Preference; + import com.android.settings.widget.AppPreference; import com.android.settings.widget.RestrictedAppPreference; diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index c5389ca496cc5cbc9638c181c9208ed4df83440b..234ec5e53e12a91fa0d0309362e270961d4cf2ef 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -15,8 +15,9 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 469449ff107d1f10b46e75de1691065111d39bab..b0776f0e59e9d4fe6ea10e14c9d017e97e26f897 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -22,11 +22,11 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.SystemProperties; -import android.provider.SettingsSlicesContract; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.internal.telephony.TelephonyIntents; import com.android.internal.telephony.TelephonyProperties; diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index 1d6e81ee7089382abe9b6049e6e880fef0821048..9bc435a57ea7585d95feb0ed782e8b52f6159d06 100644 --- a/src/com/android/settings/network/ApnEditor.java +++ b/src/com/android/settings/network/ApnEditor.java @@ -28,13 +28,6 @@ import android.net.Uri; import android.os.Bundle; import android.os.PersistableBundle; import android.provider.Telephony; -import androidx.annotation.VisibleForTesting; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; import android.telephony.CarrierConfigManager; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; @@ -48,6 +41,14 @@ import android.view.MenuItem; import android.view.View; import android.view.View.OnKeyListener; +import androidx.annotation.VisibleForTesting; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.ArrayUtils; diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java index ee53ca9518f079b6def97bc4519c6112ec4f9c7b..412259bab729dff48af62f10906dcfa542cb0fd8 100755 --- a/src/com/android/settings/network/ApnPreference.java +++ b/src/com/android/settings/network/ApnPreference.java @@ -21,8 +21,6 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.Telephony; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.util.AttributeSet; import android.util.Log; @@ -32,6 +30,9 @@ import android.widget.CompoundButton; import android.widget.RadioButton; import android.widget.RelativeLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class ApnPreference extends Preference implements diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index b47cb424a181fad7e97962bde9f83fac5f46fc69..df0b1b4dfeacdf89c8d021608e962c92bd90cf39 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -37,8 +37,6 @@ import android.os.PersistableBundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Telephony; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; @@ -52,6 +50,9 @@ import android.view.MenuItem; import android.view.MotionEvent; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index e4d52bc8d090e8eecd4f1d82e679869afd4ca2cc..5e729afec3cc0bd614ed8ad29b0cc407f39c5520 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -24,13 +24,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.TelephonyManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index f29f11c3320d6f4a85565363fe004f97dacba12b..1db6b2e0b320cb43740a487d86dcc37196c9b361 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -31,11 +31,12 @@ import android.net.NetworkInfo; import android.net.Uri; import android.os.Bundle; import android.os.UserManager; -import androidx.preference.Preference; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 5dafeec2e167a35ced22de91f0d2539b9cc7fa68..581799930ed0a75600718ba9fc615eac6b547be7 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -24,10 +24,11 @@ import android.app.Dialog; import android.app.Fragment; import android.content.Context; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java index 5ae3a77423eb5eafaeca3b0e6c454d61423ebe58..bb1fde7bf591c7f338d1c345bce60998efd85fda 100644 --- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java +++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java @@ -19,6 +19,7 @@ package com.android.settings.network; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index 0a63adca80cb1e2c43c042de1007d04e9dc4f35c..d9c20ffdf48240d801a89070fafa674bc55bb9d0 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -19,14 +19,15 @@ import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 98482016e4c0131176d8d43a25d841d92312fb62..7239b00d084d3785057a4a93968e47c0fc8da303 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.network; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 0627cb305443bbfe8e6262c067513770e55992be..8ba2d62c3fcca2b1f47d43ae6b0e83158e813df4 100644 --- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java +++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java @@ -29,7 +29,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.system.Os; import android.text.Editable; import android.text.TextWatcher; @@ -42,6 +41,8 @@ import android.widget.EditText; import android.widget.RadioGroup; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; @@ -49,7 +50,6 @@ import com.android.settings.utils.AnnotationSpan; import com.android.settingslib.CustomDialogPreference; import com.android.settingslib.HelpUtils; -import java.net.InetAddress; import java.util.HashMap; import java.util.Map; diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 13e5bf342dc57967ad043a65c6c45c8658779227..62714fa63805b1dfde2c3133dacf170185215720 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -23,8 +23,8 @@ import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; -import android.content.Context; import android.content.ContentResolver; +import android.content.Context; import android.content.res.Resources; import android.database.ContentObserver; import android.net.ConnectivityManager; @@ -35,6 +35,7 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -42,9 +43,9 @@ import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.core.lifecycle.LifecycleObserver; import java.net.InetAddress; import java.util.List; diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java index dc2eb9f5bdb80610cf65cc0ac5a4cebc3c1a9780..8f26bfb6b100a129979323b9e2fa65f89007860b 100644 --- a/src/com/android/settings/network/ProxyPreferenceController.java +++ b/src/com/android/settings/network/ProxyPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.network; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index 4bafa2511d0b53fd59d08ed05e3585b4bcfe0e33..a47b897b191a3fb65b27a6a26818abcb925266ad 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static android.os.UserManager.DISALLOW_CONFIG_TETHERING; + import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction; @@ -33,6 +34,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/network/VpnPreferenceController.java b/src/com/android/settings/network/VpnPreferenceController.java index bb0bff638ea587bab40b2c6d8d1e83ca3254bb75..8ecd79660f9d951d2a9e7eb2b2702806b795dab2 100644 --- a/src/com/android/settings/network/VpnPreferenceController.java +++ b/src/com/android/settings/network/VpnPreferenceController.java @@ -29,11 +29,12 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import android.util.Log; +import android.util.SparseArray; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.util.SparseArray; import com.android.internal.net.LegacyVpnInfo; import com.android.internal.net.VpnConfig; diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 4e90680aac9b08a0a713ce66c21645a7e041fa90..ebed87b9a2be620f58826c217383564a37d57509 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -16,6 +16,8 @@ package com.android.settings.nfc; +import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import android.nfc.NfcAdapter; import android.os.Bundle; import android.os.UserHandle; @@ -28,16 +30,14 @@ import android.view.ViewGroup; import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; -import com.android.settingslib.HelpUtils; -import com.android.settings.core.InstrumentedFragment; import com.android.settings.R; import com.android.settings.SettingsActivity; +import com.android.settings.core.InstrumentedFragment; +import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.widget.SwitchBar; +import com.android.settingslib.HelpUtils; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; - public class AndroidBeam extends InstrumentedFragment implements SwitchBar.OnSwitchChangeListener { private View mView; diff --git a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java index 12ab1b756dcde359735d4db44e5f8b216aed3928..07931523ff8bfc3af988ed248aa6c551c660db8d 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -26,8 +27,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import java.util.List; - public class AndroidBeamPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/BaseNfcEnabler.java b/src/com/android/settings/nfc/BaseNfcEnabler.java index 88bafb98fb94e882ab52b062a1951ee756480178..c046d05aced4e2a804fe14e2fe853de12e88aaf1 100644 --- a/src/com/android/settings/nfc/BaseNfcEnabler.java +++ b/src/com/android/settings/nfc/BaseNfcEnabler.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.nfc.NfcAdapter; -import androidx.preference.Preference; /** * BaseNfcEnabler is a abstract helper to manage the Nfc state for Nfc and Android Beam diff --git a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java index d0ce045296ff79925680dbf691ce53768a6af7cd..b3e6f256157c3c3e86e7b0f84190ecd621cb3bd9 100644 --- a/src/com/android/settings/nfc/NfcAirplaneModeObserver.java +++ b/src/com/android/settings/nfc/NfcAirplaneModeObserver.java @@ -22,6 +22,7 @@ import android.nfc.NfcAdapter; import android.os.Handler; import android.os.Looper; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/nfc/NfcEnabler.java b/src/com/android/settings/nfc/NfcEnabler.java index b3450cbb8cdf0d5c62d4e41453d1f571827828c7..77c40e2de1ae88ca007234a68f026594e3dc0559 100644 --- a/src/com/android/settings/nfc/NfcEnabler.java +++ b/src/com/android/settings/nfc/NfcEnabler.java @@ -18,6 +18,7 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; + import androidx.preference.SwitchPreference; /** diff --git a/src/com/android/settings/nfc/NfcForegroundPreference.java b/src/com/android/settings/nfc/NfcForegroundPreference.java index 728f2e4b5987ae03fcc8532b98dbff0b04f22ba1..8dd54827912b1fc2093f6a9ab235f7bc4d1ad3ef 100644 --- a/src/com/android/settings/nfc/NfcForegroundPreference.java +++ b/src/com/android/settings/nfc/NfcForegroundPreference.java @@ -16,6 +16,7 @@ package com.android.settings.nfc; import android.content.Context; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/nfc/NfcPaymentPreference.java b/src/com/android/settings/nfc/NfcPaymentPreference.java index 0838a90e622b060be6f1855566d19c08fbb2c6b2..9dd111354361247e152dda903c1a3e30123f59d7 100644 --- a/src/com/android/settings/nfc/NfcPaymentPreference.java +++ b/src/com/android/settings/nfc/NfcPaymentPreference.java @@ -16,12 +16,11 @@ package com.android.settings.nfc; import android.app.AlertDialog; +import android.app.Dialog; import android.content.ActivityNotFoundException; import android.content.Context; -import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -31,6 +30,8 @@ import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.RadioButton; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.nfc.PaymentBackend.PaymentAppInfo; import com.android.settingslib.CustomDialogPreference; diff --git a/src/com/android/settings/nfc/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index a74b9875605912e84f60b289eda14bcd187a169e..2ea3a3c573515f97ab0ec0d717fdd6732ef15889 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -30,8 +30,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import java.util.List; - public class NfcPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 27ae09348456bbda0c7fb0534b9ee5765dffef4b..cd2df68ea0ba202198d7807d1fc181ababbe678c 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -21,14 +21,14 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.res.Resources; import android.os.Bundle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index 4284ecfc7969242de08b7ded6b9a954734ecf480..9f4ed8f02f649fade6e42d9f36fcfbe002702535 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -27,6 +27,7 @@ import android.content.pm.ServiceInfo; import android.provider.Settings; import android.service.notification.ConditionProviderService; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java index 175a607b5205cd8a79f3d11fd5788f9aa19ebd0e..41841ddff7b8c7c170b591f4d9f63934395fa331 100644 --- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java @@ -29,6 +29,7 @@ import android.os.UserHandle; import android.provider.Settings; import android.service.notification.ScheduleCalendar; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java index 2dcc31df8a4ea84cbe157d149298fbfca5a0b298..6c0d59b479bd424f4b08d3d4d9c6a606169791dd 100644 --- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java +++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java @@ -21,6 +21,7 @@ import android.content.IntentFilter; import android.media.AudioManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.annotations.VisibleForTesting; @@ -28,7 +29,6 @@ import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.SliderPreferenceController; import com.android.settingslib.RestrictedPreference; -import com.android.settingslib.core.AbstractPreferenceController; /** * Base class for preference controller that handles preference that enforce adjust volume diff --git a/src/com/android/settings/notification/AllowSoundPreferenceController.java b/src/com/android/settings/notification/AllowSoundPreferenceController.java index a1fd3c0c8fd9aca546ec15d92313d7f8174c64fc..cbabd2d6e1d1153c0443848af40d94538820a914 100644 --- a/src/com/android/settings/notification/AllowSoundPreferenceController.java +++ b/src/com/android/settings/notification/AllowSoundPreferenceController.java @@ -22,9 +22,10 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationChannel; import android.content.Context; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java index 6e09ccebfe7e9b105d62fff606051f2ae5e2958d..c696e8ef8a4b214a80bc9fa49c9fb9329d149831 100644 --- a/src/com/android/settings/notification/AppLinkPreferenceController.java +++ b/src/com/android/settings/notification/AppLinkPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index 9ebcd33b7bf2b938034b7e0b0c370654b62d11d8..a5f7ff10eaa054fe37913426f0271e016b65e84b 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -21,13 +21,14 @@ import android.app.NotificationChannelGroup; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/notification/AudioHelper.java b/src/com/android/settings/notification/AudioHelper.java index 5f745c8a691443cde5559089aa65ca6b80ba3a59..a918d8689d66d8007ebcefef72c8ccf09c393a7a 100644 --- a/src/com/android/settings/notification/AudioHelper.java +++ b/src/com/android/settings/notification/AudioHelper.java @@ -22,6 +22,7 @@ import android.media.AudioManager; import android.media.AudioSystem; import android.os.UserHandle; import android.os.UserManager; + import com.android.settings.Utils; /** diff --git a/src/com/android/settings/notification/BadgePreferenceController.java b/src/com/android/settings/notification/BadgePreferenceController.java index e6cd4494d2369d6beda71264e05fa258363f1659..ad417b0ad6aeaaaae5efd5ea4bdb7d04fbaff14b 100644 --- a/src/com/android/settings/notification/BadgePreferenceController.java +++ b/src/com/android/settings/notification/BadgePreferenceController.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; -import android.app.NotificationChannel; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index 94419c49287b7e7d8b85c3946b248ea8884a30dd..073d721ec8ec3aac11af74c5d74402f0f000d996 100644 --- a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java +++ b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java @@ -16,6 +16,8 @@ package com.android.settings.notification; +import static android.provider.Settings.Secure.NOTIFICATION_BADGING; + import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -23,16 +25,15 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; -import android.text.TextUtils; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.TogglePreferenceController; -import com.android.settingslib.core.AbstractPreferenceController; -import com.android.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; @@ -40,8 +41,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static android.provider.Settings.Secure.NOTIFICATION_BADGING; - public class BadgingNotificationPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java index 65d31193984d4bae56eca92a0f40502a53d120b8..9e4c46320046b861a39aa3514464976eadb09066 100644 --- a/src/com/android/settings/notification/BlockPreferenceController.java +++ b/src/com/android/settings/notification/BlockPreferenceController.java @@ -16,16 +16,16 @@ package com.android.settings.notification; -import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.Preference; import android.widget.Switch; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java index 97639b1cd56268e40b8f1fb6999150626f8f1b29..a6871639a7fd8aa5ab4bffd8767e7eea0750f95e 100644 --- a/src/com/android/settings/notification/BootSoundPreferenceController.java +++ b/src/com/android/settings/notification/BootSoundPreferenceController.java @@ -18,10 +18,12 @@ package com.android.settings.notification; import android.content.Context; import android.os.SystemProperties; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index c17b3b070050d27da47ed3e2206982fde09c71c9..17710c4c58e1a906fc922be9234576cacc148184 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -18,9 +18,10 @@ package com.android.settings.notification; import android.app.NotificationChannel; import android.content.Context; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 0ea0eaccff81f141c8221a9d53b921499e52a304..3580967b4613874f84a6faee8c79a5becdeda3e3 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -20,14 +20,14 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; -import com.android.settings.applications.AppInfoBase; import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; diff --git a/src/com/android/settings/notification/ChargingSoundPreferenceController.java b/src/com/android/settings/notification/ChargingSoundPreferenceController.java index e280177ce6d5f9175a67c4f999e1b8bed7297ea9..fccde6a56e36219ae4a62046bb927074a9ca697a 100644 --- a/src/com/android/settings/notification/ChargingSoundPreferenceController.java +++ b/src/com/android/settings/notification/ChargingSoundPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; - import android.provider.Settings.Global; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index bd7a82ae8e2b3d31cbbfc98c7eb1cf222d2ee873..b396073e8f6221c2d5e3bd2c32ed0a703603ee3b 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -24,16 +24,15 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.RingtonePreference; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.SummaryLoader; -import com.android.settings.gestures.SwipeToNotificationPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/DefaultNotificationTonePreference.java b/src/com/android/settings/notification/DefaultNotificationTonePreference.java index 3a7d3b1922a9ac9ecb9c047f1f48e95e5488271d..4a2e0b610d2e7b645af982e61ce9e86fddea98a2 100644 --- a/src/com/android/settings/notification/DefaultNotificationTonePreference.java +++ b/src/com/android/settings/notification/DefaultNotificationTonePreference.java @@ -17,25 +17,15 @@ package com.android.settings.notification; -import com.android.settings.DefaultRingtonePreference; -import com.android.settings.Utils; - -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.database.Cursor; -import android.database.sqlite.SQLiteException; import android.media.Ringtone; import android.media.RingtoneManager; -import android.os.AsyncTask; -import android.os.UserHandle; -import android.os.UserManager; import android.net.Uri; -import android.provider.MediaStore; -import android.provider.OpenableColumns; +import android.os.AsyncTask; import android.util.AttributeSet; -import static android.content.ContentProvider.getUriWithoutUserId; +import com.android.settings.DefaultRingtonePreference; public class DefaultNotificationTonePreference extends DefaultRingtonePreference { private Uri mRingtone; diff --git a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java index 1ebc01c1337ad8fc2bf0762a6581e5bcc1368655..14e0c84e2f87c0ffc7efac5488834693c1d7dfd6 100644 --- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java +++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java index 61a9ddb96c5a6d970009ce0ad1256ea7ea8ecf9c..1e996463aa0d85fa5aec0d9f3f5702017fbee378 100644 --- a/src/com/android/settings/notification/DescriptionPreferenceController.java +++ b/src/com/android/settings/notification/DescriptionPreferenceController.java @@ -17,9 +17,10 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; public class DescriptionPreferenceController extends NotificationPreferenceController diff --git a/src/com/android/settings/notification/DialPadTonePreferenceController.java b/src/com/android/settings/notification/DialPadTonePreferenceController.java index e0ca2996834a62bf5c2244623f140646904a4183..1b05ce21187de94666ed9d547938dbae12068675 100644 --- a/src/com/android/settings/notification/DialPadTonePreferenceController.java +++ b/src/com/android/settings/notification/DialPadTonePreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; - import android.provider.Settings.System; + import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/DndPreferenceController.java b/src/com/android/settings/notification/DndPreferenceController.java index acbc0704bb46b03ad955c6213e86488b68ea829f..a615221dff921a5e86e4a4d0cfd271cc9b49b5b6 100644 --- a/src/com/android/settings/notification/DndPreferenceController.java +++ b/src/com/android/settings/notification/DndPreferenceController.java @@ -17,15 +17,12 @@ package com.android.settings.notification; import android.app.NotificationChannel; -import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnResume; public class DndPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java index f7f13c58ff5640968f7cbd6d2e835a086fec91d6..d9367d58ab267eab10bd5f5ab9a723bfdc9b3295 100644 --- a/src/com/android/settings/notification/DockAudioMediaPreferenceController.java +++ b/src/com/android/settings/notification/DockAudioMediaPreferenceController.java @@ -19,10 +19,9 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; - import android.content.res.Resources; import android.provider.Settings.Global; -import android.telephony.TelephonyManager; + import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/DockingSoundPreferenceController.java b/src/com/android/settings/notification/DockingSoundPreferenceController.java index 476fd6a990ea30f56e6d8b74196774e7a8dbaae6..f3a281ec4cd8361d2e91188f1b1b138f7020a64a 100644 --- a/src/com/android/settings/notification/DockingSoundPreferenceController.java +++ b/src/com/android/settings/notification/DockingSoundPreferenceController.java @@ -20,6 +20,7 @@ import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; import android.provider.Settings.Global; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java index e67de2b48c06989fe615a7240dc2d259c3771d10..7add167ab8e5c3ee1cfa04062400c46d19e6f384 100644 --- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java +++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.os.UserManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/notification/EmergencyTonePreferenceController.java b/src/com/android/settings/notification/EmergencyTonePreferenceController.java index a67ec8aac302d80119d4da5c730e57ea6490c6de..9c2a9584eb26844b411419e89b2f167d763373fc 100644 --- a/src/com/android/settings/notification/EmergencyTonePreferenceController.java +++ b/src/com/android/settings/notification/EmergencyTonePreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; import android.content.Context; - import android.content.res.Resources; import android.provider.Settings.Global; import android.telephony.TelephonyManager; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/EmptyTextSettings.java b/src/com/android/settings/notification/EmptyTextSettings.java index 3f8ccc63097639b0a25a71c5d5bed22f4fa3c46b..4ac3d52d1d55b9d1869c76a7b683e0aa1d0d2296 100644 --- a/src/com/android/settings/notification/EmptyTextSettings.java +++ b/src/com/android/settings/notification/EmptyTextSettings.java @@ -24,7 +24,7 @@ import android.view.View; import android.view.ViewGroup; import android.view.ViewGroup.LayoutParams; import android.widget.TextView; -import com.android.settings.R; + import com.android.settings.SettingsPreferenceFragment; public abstract class EmptyTextSettings extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/notification/HeaderPreferenceController.java b/src/com/android/settings/notification/HeaderPreferenceController.java index 29b8670a6a8f08ee79b742804bce7db1ea69d4a5..dc8b557be48f34059c2cccc5aa3b5e8e620c7920 100644 --- a/src/com/android/settings/notification/HeaderPreferenceController.java +++ b/src/com/android/settings/notification/HeaderPreferenceController.java @@ -19,17 +19,17 @@ package com.android.settings.notification; import static com.android.settings.widget.EntityHeaderController.PREF_KEY_APP_HEADER; import android.app.Activity; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; import android.content.Context; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.text.BidiFormatter; import android.text.SpannableStringBuilder; import android.text.TextUtils; -import android.util.Slog; import android.view.View; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java index c05647240fc1797661102361231ef80d6bcf96c1..4c20a46409d668396431d544c2577aaab7ef14f6 100644 --- a/src/com/android/settings/notification/ImportancePreferenceController.java +++ b/src/com/android/settings/notification/ImportancePreferenceController.java @@ -26,6 +26,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.media.RingtoneManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java index 3710cc5a9962fa2e7f3bdfb10462906da4d7f375..04f25510c2eda5ff168d2c2616aefc689db69954 100644 --- a/src/com/android/settings/notification/LightsPreferenceController.java +++ b/src/com/android/settings/notification/LightsPreferenceController.java @@ -16,17 +16,14 @@ package com.android.settings.notification; -import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; -import com.android.settingslib.core.lifecycle.LifecycleObserver; -import com.android.settingslib.core.lifecycle.events.OnResume; public class LightsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index 518d2a949bbd2610e1e714acea7d36259b47e25f..d708edfb53b3319a9c8dc0d4141007a28b0e177c 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -28,11 +28,12 @@ import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.RestrictedListPreference; diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/NotificationAppPreference.java index bb015ca3f25732e82007448f013b97cb385e356b..dfa3e36800b1e2c8869bef0249ccd7685747317f 100644 --- a/src/com/android/settings/notification/NotificationAppPreference.java +++ b/src/com/android/settings/notification/NotificationAppPreference.java @@ -16,11 +16,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.Switch; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java index 2b41281c5101e606c98e20cc3bfc5a743694a051..abaffc85941b64e57c99b1dd1319475fec359361 100644 --- a/src/com/android/settings/notification/NotificationFooterPreference.java +++ b/src/com/android/settings/notification/NotificationFooterPreference.java @@ -17,13 +17,14 @@ package com.android.settings.notification; import android.content.Context; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.method.LinkMovementMethod; import android.util.AttributeSet; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.R; /** diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java index 01eecf52ed727474ab4c7a563372e9ba0fbd98d2..b3f39f9a7391d13a5b3d510aa05b1cb95983f066 100644 --- a/src/com/android/settings/notification/NotificationLockscreenPreference.java +++ b/src/com/android/settings/notification/NotificationLockscreenPreference.java @@ -16,11 +16,6 @@ package com.android.settings.notification; -import com.android.settings.R; -import com.android.settings.RestrictedListPreference; -import com.android.settings.Utils; -import com.android.settingslib.RestrictedLockUtils; - import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; @@ -33,10 +28,14 @@ import android.util.AttributeSet; import android.view.View; import android.widget.CheckBox; import android.widget.CompoundButton; -import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; +import com.android.settings.R; +import com.android.settings.RestrictedListPreference; +import com.android.settings.Utils; +import com.android.settingslib.RestrictedLockUtils; + public class NotificationLockscreenPreference extends RestrictedListPreference { private boolean mAllowRemoteInput; diff --git a/src/com/android/settings/notification/NotificationPreferenceController.java b/src/com/android/settings/notification/NotificationPreferenceController.java index 49bb08ef154d9779ca0fd7fcc4060fbf5c2eaafd..0b3db1505a4663f3ce3a993f99c5d5dff3fa2e0f 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -25,10 +25,10 @@ import android.app.NotificationManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index 6006162955bc9146fb4c3a0898eabb87437ff224..50caaf830000ec3d3c164615e5c31648851f5119 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -18,9 +18,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; -import android.app.Activity; import android.app.Notification; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; @@ -37,13 +37,14 @@ import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index e63e5886461cf5146da65c9ecf863a7c9eea43cd..d3ebc08f77a7a6bfcdccaa0e370384c10c9402b1 100644 --- a/src/com/android/settings/notification/NotificationStation.java +++ b/src/com/android/settings/notification/NotificationStation.java @@ -39,9 +39,6 @@ import android.service.notification.NotificationListenerService; import android.service.notification.NotificationListenerService.Ranking; import android.service.notification.NotificationListenerService.RankingMap; import android.service.notification.StatusBarNotification; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.TextUtils; @@ -52,6 +49,10 @@ import android.widget.DateTimeView; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -60,7 +61,6 @@ import com.android.settings.Utils; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.Date; import java.util.List; public class NotificationStation extends SettingsPreferenceFragment { diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java index ede7d881f96b6791ecc77b7a5debf314e6d5532e..ff4298799256d229b8d04c0cca6b4fcae29c60a7 100644 --- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java +++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java @@ -17,10 +17,11 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java index 4dbf4917641b078ae379f0c778f17c08324662c9..8762f91c2714e133b7145af7793b966f45eef0bb 100644 --- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java +++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java index cb1115165fe9f9164d0f534bfd2371897278cf01..049dfe51b60cd31aa566577372fb0bba8cb68471 100644 --- a/src/com/android/settings/notification/PhoneRingtonePreferenceController.java +++ b/src/com/android/settings/notification/PhoneRingtonePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.content.Context; import android.media.RingtoneManager; + import com.android.settings.Utils; public class PhoneRingtonePreferenceController extends RingtonePreferenceControllerBase { diff --git a/src/com/android/settings/notification/PulseNotificationPreferenceController.java b/src/com/android/settings/notification/PulseNotificationPreferenceController.java index 15bbf6d115b202ded0b630d8cb70969cb77d33f1..63fe7463ac7b531e9f2fb58432492c988952bf16 100644 --- a/src/com/android/settings/notification/PulseNotificationPreferenceController.java +++ b/src/com/android/settings/notification/PulseNotificationPreferenceController.java @@ -16,16 +16,19 @@ package com.android.settings.notification; +import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import android.content.ContentResolver; import android.content.Context; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -33,8 +36,6 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; - public class PulseNotificationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index 8081e4e943ff871b389e55fa8eaeec04f1725e48..e1132019223cc4c5bbadab892e7e9e0b12f010e2 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -24,16 +24,17 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; import android.service.notification.NotifyingApp; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.IconDrawableFactory; import android.util.Log; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index becf95fece7d2a6317c2c28c897ea47fa7bb210b..75ad4a701df622aa456aea6ab65fc660676f2141 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.app.NotificationManager; -import androidx.lifecycle.OnLifecycleEvent; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -30,6 +29,8 @@ import android.os.Message; import android.os.Vibrator; import android.text.TextUtils; +import androidx.lifecycle.OnLifecycleEvent; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java index 21b7e539a18a353caaeef86659c5e1ebbddde07c..7d5ebf13347fdaa616b7d54b9fc215f17577bb90 100644 --- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java +++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java @@ -20,6 +20,7 @@ import android.content.Context; import android.media.Ringtone; import android.media.RingtoneManager; import android.net.Uri; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java index 11aaa92dd01121f131330ca0276b9588273d07e1..896d99e1ed9762d4caeda84214775529a486e776 100644 --- a/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java +++ b/src/com/android/settings/notification/ScreenLockSoundPreferenceController.java @@ -19,8 +19,8 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; - import android.provider.Settings.System; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/SettingPref.java b/src/com/android/settings/notification/SettingPref.java index 08031b12fbb1fb21a9e8baa4c6d2a2c7a9a919f8..2cd2a137ce798bdc6930fcab3dc5175c455e8e4a 100644 --- a/src/com/android/settings/notification/SettingPref.java +++ b/src/com/android/settings/notification/SettingPref.java @@ -22,6 +22,7 @@ import android.content.res.Resources; import android.net.Uri; import android.provider.Settings.Global; import android.provider.Settings.System; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 891c7b3f8fa91b347d849f62d55b9a480949ca44..9d54190f225a4fb8636444bd644409d6b4ae51da 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -18,10 +18,10 @@ package com.android.settings.notification; import android.content.ContentResolver; import android.content.Context; - import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java index 6c537ff0d26467f2091bdd29ab282aa8788a9429..d0b098c8d60faf303fefa34cad6bebe0c8cb0ace 100644 --- a/src/com/android/settings/notification/SoundPreferenceController.java +++ b/src/com/android/settings/notification/SoundPreferenceController.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.preference.PreferenceManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 4e8218fbb569fe6a7977d71dc9c58572841dd81c..0b12b21c306ec3bfb843f2dcf860476bd695049c 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -25,10 +25,11 @@ import android.os.Message; import android.os.UserHandle; import android.preference.SeekBarVolumizer; import android.provider.SearchIndexableResource; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/notification/SuppressorHelper.java b/src/com/android/settings/notification/SuppressorHelper.java index 837517ca82ad2b5b3e5dc1386cccc7034894cfba..d3a017c4c649b350e31aeaa74c036a74a019fdcd 100644 --- a/src/com/android/settings/notification/SuppressorHelper.java +++ b/src/com/android/settings/notification/SuppressorHelper.java @@ -20,9 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + public class SuppressorHelper { private static final String TAG = "SuppressorHelper"; diff --git a/src/com/android/settings/notification/TouchSoundPreferenceController.java b/src/com/android/settings/notification/TouchSoundPreferenceController.java index 20c9cee0d05826a15f560676ccf96ed96bed841c..608cf677965cce4d83c9cda17c43b9821e878293 100644 --- a/src/com/android/settings/notification/TouchSoundPreferenceController.java +++ b/src/com/android/settings/notification/TouchSoundPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; - import android.media.AudioManager; import android.os.AsyncTask; import android.provider.Settings.System; + import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java index acb6b4d52c3dc5700e5c8ed1e0954ef432ba493b..0ae4c03040b322a0b2869dceeed76e784dda715b 100644 --- a/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java +++ b/src/com/android/settings/notification/VibrateOnTouchPreferenceController.java @@ -21,6 +21,7 @@ import static com.android.settings.notification.SettingPref.TYPE_SYSTEM; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; + import com.android.settings.SettingsPreferenceFragment; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java index 3d9557e34703307efb25c337e8ae5ea0a03751dd..ae111b2081208c3f0200f816ff48661fb594496b 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -24,9 +24,10 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java index 04aa201a587b8941cc2460e313dfe8a0376cd59c..ec5554a9d4591fe0a62d4792c5ee2175430a54b9 100644 --- a/src/com/android/settings/notification/VibrationPreferenceController.java +++ b/src/com/android/settings/notification/VibrationPreferenceController.java @@ -16,10 +16,10 @@ package com.android.settings.notification; -import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.Vibrator; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java index e1b067bc378974f5e1d40eac50a98eda93ab3b64..114759cd3f0beaf6cc3136491992eba872e33f51 100644 --- a/src/com/android/settings/notification/VisibilityPreferenceController.java +++ b/src/com/android/settings/notification/VisibilityPreferenceController.java @@ -25,6 +25,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.provider.Settings; import android.service.notification.NotificationListenerService; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java index ee02b628b084b8f3d27741d3968846d30504706a..2ef33d4ab044dabeef306d088f93d88ac91b4a61 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreference.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java @@ -21,16 +21,16 @@ import android.content.Context; import android.media.AudioManager; import android.net.Uri; import android.preference.SeekBarVolumizer; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.SeekBar; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 720fddd7208f2d02ec4703aba8b40bbd48abd1e1..941f5bd89936a89a4060da3e310b197cb0488ff4 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -16,9 +16,10 @@ package com.android.settings.notification; +import android.content.Context; + import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.OnLifecycleEvent; -import android.content.Context; import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; diff --git a/src/com/android/settings/notification/WorkSoundPreferenceController.java b/src/com/android/settings/notification/WorkSoundPreferenceController.java index 108fbcaa2e8f11374b8cc1af86a97854e4502b42..363f0f0d2e83282ae5e39ae252058e1a59873a7e 100644 --- a/src/com/android/settings/notification/WorkSoundPreferenceController.java +++ b/src/com/android/settings/notification/WorkSoundPreferenceController.java @@ -32,6 +32,7 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceGroup; diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 62c9315f8ab0943703aaf09ac3d8cf3af21015ad..83e40225d4fc674453ca19238cfa0a969022da67 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -37,15 +37,16 @@ import android.os.Handler; import android.os.Looper; import android.os.RemoteException; import android.provider.Settings.Secure; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArraySet; import android.util.Log; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index 388b40d14b399dc445daafe93432d2ab88b21b9e..e432fb083ad817f6d64810602da36dfd5fe6b683 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -25,11 +25,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.service.notification.ZenModeConfig; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; import android.util.Slog; import android.view.View; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java index 599af2682479c8147e958f347fb4cc2711f3c010..a284db760f74ca877364a6bee936e8b389cc0529 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java @@ -19,9 +19,10 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; +import android.widget.Switch; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.widget.Switch; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java index c28b7b445636de2640d968331dabc7a3cbd48a39..000a75632068362219f6bf4f11ddb0655f678afc 100644 --- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java +++ b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.RadioButton; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/ZenFooterPreferenceController.java index a00ac6a346c0dddeee2f6b9c0f96cdbb5ca5dc5f..15a2252397c3322e49fb91e1c0b1b2bd57a85fb6 100644 --- a/src/com/android/settings/notification/ZenFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenFooterPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java index 8898b055c245f9b72075cb039d18cffa4007f4c4..d7b9db6aa69bad2ddb985fa80f636f88a0541d82 100644 --- a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java @@ -19,11 +19,12 @@ package com.android.settings.notification; import android.app.Fragment; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.utils.ZenServiceListing; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeAddAutomaticRulePreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements diff --git a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java index 70c1ae905e2715d9373589e28a40f07d40c4c8d3..96495dfbf76bf19e9a8eb7cae7ce65d60a97debf 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index 2ea46392c7bd65d8534c067baa14098dd467e850..dc9d6fefe1f467100fa7724a33935141c43a278d 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java index faa0f8a19609b272c1f912017daadf31c9f8f732..4220a42c7fddc214a12b9e3df1356c39be50feb6 100644 --- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java index 8c8f14df67194d1fff31b6c14c6bc3933f90ab84..e239b1a3c9d8ffd41d70b48255c6daaffd9c7741 100644 --- a/src/com/android/settings/notification/ZenModeBackend.java +++ b/src/com/android/settings/notification/ZenModeBackend.java @@ -26,9 +26,10 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; public class ZenModeBackend { diff --git a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java index 4ab14379e92766ba39ced881a29b8db2d1b6e54c..0dba4d6dd5d9c92b210068852ae478aab4cb9c9d 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java index 6a0b657b23fbc808276d4fb56967d6b38b939183..e9f74d2880ce1966b7d287b4873f9be2ff8af178 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java @@ -21,6 +21,7 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java index d11baee8e8b7c48d20edba8f4990ff90a94b358e..2046244c622f9c7bd8a33f8ef9a9cfad114f9555 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java index 3d250639e18f7b5740bf129e788cac863cc00d0d..425f770937482553cc112cc8ba521a89f7e3802e 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java b/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java index b017cac3157bcae4e60a24a07964d23804e7c08b..08c4ca7975bbff717f5093514f0f9caa0ff53cc1 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java index aa2b55ccbfd57974c4fe31e3f6485074848e9b70..4e11a9cf4d628a23534054b3fe6006cf2736c348 100644 --- a/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java +++ b/src/com/android/settings/notification/ZenModeBlockedEffectsSettings.java @@ -27,7 +27,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; -import androidx.preference.CheckBoxPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java index ac9497dbe3b14a411137d382bac6a3395e975cbf..215cdd1ebf6de5ad2ba5919f4a215269e81ced90 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import android.view.View; import android.widget.Button; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index 1b6c122be44fb3d1a0bd33e98fa6eb7f3f1b23f5..aceb6b998b127f055da94f40f2e8652f7c688127 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java index 5e58444efbdc520b243c1bc8b5fb21de503956cf..ccd4d5716020d076e6cbc6e6abfa1f29060d6399 100644 --- a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index 51ea51780d58d447171ca86f3912df1e4b0b974d..3dd9afb4e4a70b3191f0b8c778d768252c6a2215 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -26,6 +26,7 @@ import android.provider.CalendarContract.Calendars; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.EventInfo; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index 8ca6cf63dfdfbe184ca2a005212ef5e554f00218..235ebd5b00473bbc42da61ada2b90e5c2b3ba6a3 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java @@ -19,10 +19,10 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java index d8099bed210d7444a1004fd205a7899c137cf11b..2bec84f9c75415aadc8e568c3fd085bcd0bac38d 100644 --- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeMediaPreferenceController extends AbstractZenModePreferenceController diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index 5939abbce53d12f934c92207006f9671f4dc3b7a..f57c19304cba147e53456756dc03e0d266b3cb56 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java @@ -3,10 +3,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; +import android.text.TextUtils; + import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModePreferenceController.java b/src/com/android/settings/notification/ZenModePreferenceController.java index 0d94029f47cad1ee56bd588f248d2bee7c16d1f5..edd531a3b5ecc1ebbcd5d2731c4d8cb29d5aae48 100644 --- a/src/com/android/settings/notification/ZenModePreferenceController.java +++ b/src/com/android/settings/notification/ZenModePreferenceController.java @@ -23,9 +23,9 @@ import android.net.Uri; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Slog; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index c0f319afaf65d0e7b914083babe7444e5a2c7b09..41f1eb1c6ecd8aff7bde9760dfec3d0c09e8b1b3 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index e3f5c2f7ac4b03999cf862dd8b9cf247f5a96f85..db5c6e1b3e8552d227d43e63414129fef98fe077 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index 576da167295a7bd347d0400d5a96835de23f9810..9e5dbc33042feed78e8e283b97b73fec56d9cd9d 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -23,11 +23,12 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; import android.service.notification.ConditionProviderService; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 50ecd8bd09e3a737d04adbd1fe6067a225d4c914..cd1c6f55dfa57e8ac90ce94fab489ad96c12a3af 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -28,14 +28,15 @@ import android.os.Bundle; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ScheduleInfo; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.text.format.DateFormat; import android.util.Log; import android.widget.TimePicker; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 232502ec222236378822f245da7eb7397997daf0..ce8c8292f279a09c41c24b04787ef3e98289510d 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -34,6 +34,7 @@ import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java index c21f23dac6e5772c433051bc0eff077c95116d9f..6d5aac915da53b9f71dfac1e71dfc3a380d77491 100644 --- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index bf47154a1d6a5441d084180ace84b6de98c9bdf6..da866af13d4119dfdcc165ca2aa74faf6035eb4f 100644 --- a/src/com/android/settings/notification/ZenModeSliceBuilder.java +++ b/src/com/android/settings/notification/ZenModeSliceBuilder.java @@ -18,8 +18,6 @@ package com.android.settings.notification; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; -import static androidx.slice.builders.ListBuilder.ICON_IMAGE; - import android.annotation.ColorInt; import android.app.NotificationManager; import android.app.PendingIntent; @@ -31,6 +29,11 @@ import android.net.Uri; import android.provider.Settings; import android.provider.SettingsSlicesContract; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SubSettings; @@ -38,13 +41,6 @@ import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; - -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - -import androidx.core.graphics.drawable.IconCompat; public class ZenModeSliceBuilder { diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java index bab16619ea26ed4f0c6f95ee57fc5e95a6d373c9..9c142132365c75c54ed15d9b69c629448c152416 100644 --- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java @@ -27,6 +27,7 @@ import android.database.Cursor; import android.icu.text.ListFormatter; import android.provider.Contacts; import android.provider.ContactsContract; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java index b41f11e3cf3e5a310a52ffe89883d92c6eb05295..73907b9fffd7401ec3a636a4aa2f10a6dd6b9277 100644 --- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java @@ -19,10 +19,11 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java index 4c49224bc77fb2a2fb0e07e01573900ddae97c1d..e3098f0e22f387358b58fac72bde102162ed6027 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.CheckBoxPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; public class ZenModeVisEffectPreferenceController extends AbstractZenModePreferenceController diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java index 2af7866450b263061d2df6213aeac40ead00aa44..cd1a08a1ab19f8d3c556f70d718a1b28cceb97b3 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java index c015d9d8f22147d76d39f3d4faf30dfeb8f98018..7077bab62764530e0945541dcc8f6ff0eab60e3d 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java index 3fd5420f6a7579fc50e1cf00fdbeaee8b5470a07..0ce293dee3b3d553bf6f9894b3a0b5e8ed547594 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/notification/ZenModeVoiceActivity.java b/src/com/android/settings/notification/ZenModeVoiceActivity.java index db8de69f86271ae523f1bedc8b555cb5f99a5c0a..0a52c3da0b472359984e5792cc2883add2f2a571 100644 --- a/src/com/android/settings/notification/ZenModeVoiceActivity.java +++ b/src/com/android/settings/notification/ZenModeVoiceActivity.java @@ -16,6 +16,9 @@ package com.android.settings.notification; +import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; +import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; + import android.app.NotificationManager; import android.content.Context; import android.content.Intent; @@ -33,9 +36,6 @@ import com.android.settings.utils.VoiceSettingsActivity; import java.util.Locale; -import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_ENABLED; -import static android.provider.Settings.EXTRA_DO_NOT_DISTURB_MODE_MINUTES; - /** * Activity for modifying the Zen mode (Do not disturb) by voice * using the Voice Interaction API. diff --git a/src/com/android/settings/notification/ZenRulePreference.java b/src/com/android/settings/notification/ZenRulePreference.java index 1bb1538f014afd36750a73356c186884a4123554..03ea257c775f49e9dabee390a811da3785c8380c 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -24,9 +24,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.service.notification.ZenModeConfig; +import android.view.View; + import androidx.preference.Preference; import androidx.preference.PreferenceViewHolder; -import android.view.View; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 89e1eb8eda43fe744325234a5349222c945d3b49..8bc252a0be548297712631a2e548d73c172e6a39 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java @@ -21,6 +21,7 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; + import androidx.annotation.Keep; import com.android.settings.accounts.AccountFeatureProvider; diff --git a/src/com/android/settings/overlay/SupportFeatureProvider.java b/src/com/android/settings/overlay/SupportFeatureProvider.java index ad68a748e62a0d8754eaa9d6e52ebe6a934080dd..0988fd43aa0177fd2f77a309862870dccdab96a8 100644 --- a/src/com/android/settings/overlay/SupportFeatureProvider.java +++ b/src/com/android/settings/overlay/SupportFeatureProvider.java @@ -19,18 +19,13 @@ package com.android.settings.overlay; import android.accounts.Account; import android.annotation.IntDef; import android.annotation.NonNull; -import android.annotation.StringRes; import android.app.Activity; -import android.app.FragmentManager; import android.content.Context; -import android.content.Intent; -import android.os.Bundle; import com.android.settings.support.SupportPhone; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.List; /** * Feature provider for support tab. diff --git a/src/com/android/settings/overlay/SurveyFeatureProvider.java b/src/com/android/settings/overlay/SurveyFeatureProvider.java index d078d39247c923d6bf87bff52ec68108018309f5..44ee525060e47f08f87b68a57c021244291a5f1f 100644 --- a/src/com/android/settings/overlay/SurveyFeatureProvider.java +++ b/src/com/android/settings/overlay/SurveyFeatureProvider.java @@ -18,7 +18,7 @@ package com.android.settings.overlay; import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; -import android.content.IntentFilter; + import androidx.annotation.Nullable; import androidx.localbroadcastmanager.content.LocalBroadcastManager; diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java index add05e4e4a50b9fc64b058ac31c290dc7fc57412..4a1d50e94d89376171b7f9ab638504b56e8da035 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -19,7 +19,8 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PARENT_PROFILE_PASSWORD; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; -import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment.RESULT_FINISHED; +import static com.android.settings.password.ChooseLockPassword.ChooseLockPasswordFragment + .RESULT_FINISHED; import android.accessibilityservice.AccessibilityServiceInfo; import android.app.Activity; @@ -39,15 +40,16 @@ import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; import android.security.KeyStore; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.EncryptionInterstitial; diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java index 2550510a3e67c75b2e2cca2642f2260a2202d632..98e81a83a3d89695b8c3e066c17543a8a86b6f27 100644 --- a/src/com/android/settings/password/ChooseLockGenericController.java +++ b/src/com/android/settings/password/ChooseLockGenericController.java @@ -19,6 +19,7 @@ package com.android.settings.password; import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; + import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 1913ec6872771d8b433520f9e43a0f8af65b9ac4..4fad4eb28cc42aaf180fb12d20022bc4e0ab318f 100644 --- a/src/com/android/settings/password/ChooseLockPassword.java +++ b/src/com/android/settings/password/ChooseLockPassword.java @@ -34,9 +34,6 @@ import android.graphics.Typeface; import android.os.Bundle; import android.os.Handler; import android.os.Message; -import androidx.annotation.StringRes; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.InputType; import android.text.Selection; @@ -55,6 +52,10 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternUtils.RequestThrottledException; diff --git a/src/com/android/settings/password/ManagedLockPasswordProvider.java b/src/com/android/settings/password/ManagedLockPasswordProvider.java index 5786a5afa09a1cedb86f6092b67bd8fce76f62bf..2494af556ed89181c2d69820e3bdaf0ed9f6d0f6 100644 --- a/src/com/android/settings/password/ManagedLockPasswordProvider.java +++ b/src/com/android/settings/password/ManagedLockPasswordProvider.java @@ -19,8 +19,6 @@ package com.android.settings.password; import android.content.Context; import android.content.Intent; -import com.android.settings.R; - /** * Helper for handling managed passwords in security settings UI. * It provides resources that should be shown in settings UI when lock password quality is set to diff --git a/src/com/android/settings/password/PasswordRequirementAdapter.java b/src/com/android/settings/password/PasswordRequirementAdapter.java index 0148ca5568373050db0f040a0ab279765c6f8268..0e194afca166d98017c9c7978551e89bade07b9b 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -16,12 +16,13 @@ package com.android.settings.password; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder; diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java index a8d51eddd4adb4032bb2442f8f34dcbf2a4578fb..d4227b2abaf679823f6a2b637a2184e91eb4fc2e 100644 --- a/src/com/android/settings/password/SetNewPasswordController.java +++ b/src/com/android/settings/password/SetNewPasswordController.java @@ -19,6 +19,7 @@ package com.android.settings.password; import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; + import static com.android.internal.util.Preconditions.checkNotNull; import android.annotation.Nullable; diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index a72047308c2910353b8246c3dcf96307e8fbc6e3..9744365d8b6ccccb24873b8167b7e5bfdc53de4e 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -22,14 +22,15 @@ import android.content.Intent; import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.SetupEncryptionInterstitial; diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index 56b66a324aacf85f3898c5cd7364c2352953e5b1..452a34bdc6a154dd3cf0a47c15488b05cf598821 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -22,12 +22,13 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 0b272f5b93863dff8f00f959baabfad7952909d1..0fa5710c4c659b3f293e4080f40c59d1dbd491c9 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -20,12 +20,13 @@ import android.app.Fragment; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.Nullable; + import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index f5396c4efd292c030a99c754e5831b68cc6cf9c8..fdcdb2f77bfa635427820d818ea6d656988d3fea 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -22,6 +22,7 @@ import android.app.Dialog; import android.app.FragmentManager; import android.content.DialogInterface; import android.os.Bundle; + import androidx.annotation.NonNull; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index bb50d0af259ee1372b8b68bc2b77a51bc2f42d32..ba0172ba5609995b2fac0cd916832c413b48257f 100644 --- a/src/com/android/settings/print/PrintJobSettingsFragment.java +++ b/src/com/android/settings/print/PrintJobSettingsFragment.java @@ -25,7 +25,6 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.print.PrintManager.PrintJobStateChangeListener; -import androidx.preference.Preference; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -36,6 +35,8 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 3e3582397bdf1057549585add2602ee9e4f805af..a47bb978e9f70ce384783753eff1326af20a9f21 100644 --- a/src/com/android/settings/print/PrintServiceSettingsFragment.java +++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java @@ -44,8 +44,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; -import android.view.ViewGroup; import android.view.View.OnClickListener; +import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.widget.AdapterView; import android.widget.BaseAdapter; diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java index f40846a121fc38de3f5cefbd965a35c9bc9fe573..16c432032f8ab2def9bed3f6ef0749b0709c89d2 100644 --- a/src/com/android/settings/print/PrintSettingPreferenceController.java +++ b/src/com/android/settings/print/PrintSettingPreferenceController.java @@ -24,6 +24,7 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index b42be8f29e43ec7d5a2745c5ae98f54203cb9309..da0948b64248e302f529b23ff542662d132caa55 100644 --- a/src/com/android/settings/print/PrintSettingsFragment.java +++ b/src/com/android/settings/print/PrintSettingsFragment.java @@ -39,8 +39,6 @@ import android.print.PrintServicesLoader; import android.printservice.PrintServiceInfo; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; @@ -51,6 +49,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 3864750a67b0dcd5c48d9cc029405762b52359ef..f234bbe8edc55a65677d04d05cd0ef80f62a8b67 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -20,13 +20,14 @@ import android.annotation.XmlRes; import android.content.Context; import android.content.res.XmlResourceParser; import android.provider.SearchIndexableResource; -import androidx.annotation.CallSuper; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; +import androidx.annotation.CallSuper; +import androidx.annotation.VisibleForTesting; + import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerListHelper; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java index e793cac5475ecfe846bd2c5d11500a861da86054..a7f4005547f9e46e8e3b1749c44b8497a7b3c2c4 100644 --- a/src/com/android/settings/search/DatabaseIndexingManager.java +++ b/src/com/android/settings/search/DatabaseIndexingManager.java @@ -55,11 +55,11 @@ import android.database.sqlite.SQLiteException; import android.os.Build; import android.provider.SearchIndexablesContract; import android.provider.SearchIndexablesContract.SiteMapColumns; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; -import com.android.settings.overlay.FeatureFactory; +import androidx.annotation.VisibleForTesting; + import com.android.settings.search.indexing.IndexData; import com.android.settings.search.indexing.IndexDataConverter; import com.android.settings.search.indexing.PreIndexData; diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 3eb904119bc7a90e60d77cc3156458c010b5dc43..0b12fe49cace102afbbb2e698af7db70eff5d8e4 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -17,6 +17,7 @@ package com.android.settings.search; import static android.app.slice.Slice.HINT_LARGE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; + import static com.android.settings.search.DeviceIndexFeatureProvider.createDeepLink; import android.app.job.JobParameters; @@ -28,6 +29,14 @@ import android.net.Uri.Builder; import android.provider.SettingsSlicesContract; import android.util.Log; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceViewManager; +import androidx.slice.SliceViewManager.SliceCallback; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.ListContent; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SettingsSliceProvider; @@ -36,14 +45,6 @@ import com.android.settings.slices.SliceDeepLinkSpringBoard; import java.util.Collection; import java.util.concurrent.CountDownLatch; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceViewManager; -import androidx.slice.SliceViewManager.SliceCallback; -import androidx.slice.SliceMetadata; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.ListContent; - public class DeviceIndexUpdateJobService extends JobService { private static final String TAG = "DeviceIndexUpdate"; diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index 7c87bf74f61378d8a6a5f8278caec7472cf35099..8ab9140a082face623b7395227e8e1fec3415d0d 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -23,10 +23,11 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; import android.provider.SearchIndexablesContract.SiteMapColumns; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.List; public class IndexDatabaseHelper extends SQLiteOpenHelper { diff --git a/src/com/android/settings/search/InlinePayload.java b/src/com/android/settings/search/InlinePayload.java index 1cb694a7cb6d816b364454e24a200aca26e4223b..fab1e3b7038894027a914f6d67b6c2134fc64ed8 100644 --- a/src/com/android/settings/search/InlinePayload.java +++ b/src/com/android/settings/search/InlinePayload.java @@ -17,12 +17,10 @@ package com.android.settings.search; -import android.content.Intent; - import android.content.Context; +import android.content.Intent; import android.os.Parcel; import android.provider.Settings; -import com.android.internal.annotations.VisibleForTesting; /** * Abstract Payload for inline settings results. diff --git a/src/com/android/settings/search/SearchIndexableResourcesImpl.java b/src/com/android/settings/search/SearchIndexableResourcesImpl.java index 7d7606de00eb9c42ff8733d29cdc52447b252787..63e975f0dc0b77befb3e35a8776b762806587d00 100644 --- a/src/com/android/settings/search/SearchIndexableResourcesImpl.java +++ b/src/com/android/settings/search/SearchIndexableResourcesImpl.java @@ -21,11 +21,6 @@ import androidx.annotation.VisibleForTesting; import com.android.settings.DateTimeSettings; import com.android.settings.DisplaySettings; import com.android.settings.LegalSettings; -import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment; -import com.android.settings.connecteddevice.BluetoothDashboardFragment; -import com.android.settings.datausage.DataUsageSummaryLegacy; -import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilityShortcutPreferenceFragment; import com.android.settings.accessibility.MagnificationPreferenceFragment; @@ -37,14 +32,19 @@ import com.android.settings.applications.SpecialAccessSettings; import com.android.settings.applications.assist.ManageAssist; import com.android.settings.backup.BackupSettingsActivity; import com.android.settings.backup.BackupSettingsFragment; +import com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment; +import com.android.settings.connecteddevice.BluetoothDashboardFragment; import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment; +import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment; import com.android.settings.connecteddevice.usb.UsbDetailsFragment; import com.android.settings.datausage.DataUsageSummary; +import com.android.settings.datausage.DataUsageSummaryLegacy; import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; import com.android.settings.development.DevelopmentSettingsDashboardFragment; import com.android.settings.deviceinfo.DeviceInfoSettings; import com.android.settings.deviceinfo.StorageDashboardFragment; import com.android.settings.deviceinfo.StorageSettings; +import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.display.AmbientDisplaySettings; import com.android.settings.display.AutoBrightnessSettings; import com.android.settings.display.NightDisplaySettings; @@ -52,17 +52,17 @@ import com.android.settings.display.ScreenZoomSettings; import com.android.settings.dream.DreamSettings; import com.android.settings.enterprise.EnterprisePrivacySettings; import com.android.settings.fuelgauge.PowerUsageAdvanced; -import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.fuelgauge.PowerUsageSummary; import com.android.settings.fuelgauge.SmartBatterySettings; +import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings; import com.android.settings.gestures.AssistGestureSettings; import com.android.settings.gestures.DoubleTapPowerSettings; import com.android.settings.gestures.DoubleTapScreenSettings; import com.android.settings.gestures.DoubleTwistGestureSettings; -import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.gestures.GestureSettings; import com.android.settings.gestures.PickupGestureSettings; import com.android.settings.gestures.SwipeToNotificationSettings; +import com.android.settings.gestures.SwipeUpGestureSettings; import com.android.settings.inputmethod.AvailableVirtualKeyboardFragment; import com.android.settings.inputmethod.PhysicalKeyboardFragment; import com.android.settings.inputmethod.VirtualKeyboardFragment; @@ -75,9 +75,9 @@ import com.android.settings.nfc.PaymentSettings; import com.android.settings.notification.ConfigureNotificationSettings; import com.android.settings.notification.SoundSettings; import com.android.settings.notification.ZenModeAutomationSettings; +import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeCallsSettings; import com.android.settings.notification.ZenModeMsgEventReminderSettings; -import com.android.settings.notification.ZenModeBlockedEffectsSettings; import com.android.settings.notification.ZenModeRestrictNotificationsSettings; import com.android.settings.notification.ZenModeSettings; import com.android.settings.notification.ZenModeSoundVibrationSettings; diff --git a/src/com/android/settings/search/indexing/IndexDataConverter.java b/src/com/android/settings/search/indexing/IndexDataConverter.java index 8aa84fa515e2971bcd074c8372ba170472cb6ec7..4192777bd6a1ae91e095c3c8667c49212dbed86c 100644 --- a/src/com/android/settings/search/indexing/IndexDataConverter.java +++ b/src/com/android/settings/search/indexing/IndexDataConverter.java @@ -23,14 +23,15 @@ import android.content.res.Resources; import android.content.res.XmlResourceParser; import android.provider.SearchIndexableData; import android.provider.SearchIndexableResource; -import androidx.annotation.DrawableRes; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Xml; -import com.android.settings.search.DatabaseIndexingUtils; +import androidx.annotation.DrawableRes; + import com.android.settings.core.PreferenceXmlParserUtils; +import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; diff --git a/src/com/android/settings/search/indexing/PreIndexDataCollector.java b/src/com/android/settings/search/indexing/PreIndexDataCollector.java index 63000b48744c1a310fcd31b8be735d97e2dcef4a..93dc7e232559b1845e225075ebef8b9eede98024 100644 --- a/src/com/android/settings/search/indexing/PreIndexDataCollector.java +++ b/src/com/android/settings/search/indexing/PreIndexDataCollector.java @@ -17,6 +17,28 @@ package com.android.settings.search.indexing; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; +import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; + import android.Manifest; import android.content.ContentResolver; import android.content.Context; @@ -40,29 +62,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_CLASS_NAME; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_ICON_RESID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_RESID; - -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_CLASS_NAME; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ENTRIES; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_ICON_RESID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_ACTION; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_CLASS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_INTENT_TARGET_PACKAGE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEY; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_KEYWORDS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SCREEN_TITLE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_OFF; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_SUMMARY_ON; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_TITLE; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_USER_ID; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_ACTION; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_CLASS; -import static android.provider.SearchIndexablesContract.COLUMN_INDEX_XML_RES_INTENT_TARGET_PACKAGE; - /** * Collects all data from {@link android.provider.SearchIndexablesProvider} to be indexed. */ diff --git a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java index c244e47b562014399cedd60cded9961c8ea5e288..ca08cacd73827be768ee25547218ad3e729a9dde 100644 --- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index 5188d1ce9185108794d8eb8c930947e687d8b351..be9845d9ebe2e37f7e937b3b6e2c7d1e748a78fd 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -21,9 +21,10 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java index f5d9068729a49d5eef00bbdc2949610dfa14e329..9835ea228962db76078060f8813841c1d8ff8d54 100644 --- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java +++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java @@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java index 3bf61f63c1a28c086c4130984b0417c50bb441f4..060d9642e1c14b38363d47860562674b59237f20 100644 --- a/src/com/android/settings/security/CredentialStoragePreferenceController.java +++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; import android.security.KeyStore; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index 72ae0a797432f0a41c0a3a4bbf64262ecf044477..4101fadb196e421d7b05dce4c21e488ae1b82216 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -28,13 +28,14 @@ import android.os.BatteryManager; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.StorageManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.CryptKeeperConfirm; import com.android.settings.R; diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index 27e896aff3966bd31292f3e62b5a67796ff1612e..ea38068648c97dc4068dc2d4901af79e5f628e14 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index ca6dc2d4ff4d7589fb4ba49bde7d65c88d87a1a9..d0a4287a406278fe7f796b5420037d7e2f4c792d 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -27,6 +27,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/security/LockdownButtonPreferenceController.java b/src/com/android/settings/security/LockdownButtonPreferenceController.java index d0a49d7bf6aa799a2fb44b25b8be7a4694e8fb8d..8c3d19a2f623a660cda14f4adde1e526106df637 100644 --- a/src/com/android/settings/security/LockdownButtonPreferenceController.java +++ b/src/com/android/settings/security/LockdownButtonPreferenceController.java @@ -19,8 +19,6 @@ package com.android.settings.security; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index c928b8ecce724ee8ee087a46c0fdbc53edac71c0..ae5dd96f09a0e0c85be6715dc11f78153d52e0af 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -18,6 +18,7 @@ package com.android.settings.security; import android.content.Context; import android.provider.SearchIndexableResource; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index 01a02900e520566d0fb3144ac13d6eecef9faacc..012d0b66ff095d032f58588f9f3c56ff5d85e655 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.security; import android.app.Fragment; import android.content.Context; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java index d77fa628604583cfdb320a097d48306acc20d801..ee09bcad0e91dfcbce551e9337497e3312750fc4 100644 --- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java +++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; import android.security.KeyStore; + import androidx.preference.PreferenceScreen; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index 4806b8e8aaae9787a91f821eda06af3301ac185d..00892c19f692163f3f87ca92d20ac66062d328e9 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -22,15 +22,16 @@ import android.os.Bundle; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/ShowPasswordPreferenceController.java b/src/com/android/settings/security/ShowPasswordPreferenceController.java index 8672974fd2d7af589ee1513393515e75f1ffa86b..472101bfc558c8e3e97c795779015cd54dce3e25 100644 --- a/src/com/android/settings/security/ShowPasswordPreferenceController.java +++ b/src/com/android/settings/security/ShowPasswordPreferenceController.java @@ -21,9 +21,9 @@ import android.os.UserHandle; import android.provider.Settings; import com.android.internal.widget.LockPatternUtils; +import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; -import com.android.settings.R; public class ShowPasswordPreferenceController extends TogglePreferenceController { diff --git a/src/com/android/settings/security/SimLockPreferenceController.java b/src/com/android/settings/security/SimLockPreferenceController.java index 683b99a3bfba8ef109fe6e2328c09463e9758e82..d8d6252e7a3e1e606e5f1b5bc7f6ac7e71267908 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -19,13 +19,14 @@ package com.android.settings.security; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import java.util.List; diff --git a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java index 1c71975bf8deb93bc89b9957bb5933aec234db5a..00167672441c3617945f18b35cb0126dc7a6c609 100644 --- a/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java +++ b/src/com/android/settings/security/VisiblePatternProfilePreferenceController.java @@ -21,9 +21,10 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; +import android.util.Log; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; import com.android.internal.widget.LockPatternUtils; import com.android.settings.Utils; diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index c2bd38bcef59090ec35d1059c30a31f8915369c1..6aa3ccb4d4657881aea3405be5bd78a3225a6d64 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -22,10 +22,11 @@ import android.app.admin.DevicePolicyManager; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.TimeoutListPreference; diff --git a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java index 1624f12cbb819317ae4ac0a1f6e58bdf2b33dc7e..38c6f2426d34c3d1783adabf036e64b114189b24 100644 --- a/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockScreenPreferenceController.java @@ -20,6 +20,7 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED import android.content.Context; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java index 5f436803c84ec767b81bf686ee6e0d6006947747..133078c9eec1246994807f08b40af9539c1590ef 100644 --- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java +++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.TwoStatePreference; diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index 6421bd9fe9e302969c3742c46f9b2a2fe0e8bdaa..ffd01830daee2ed78200465ebd68dd094e4fbdd8 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.TwoStatePreference; -import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index 3d92bdea47d963c8112cef1b7bc98a04bad777c9..056c1f293c2b786f6bc23ac0a0d1b2773a5353ed 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.security.trustagent; import android.content.Context; import android.os.UserHandle; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index 89d8de7b04457b585a87a22ab9bb0df02a55ff77..6f5d7eb955ac8e173098cc66cf28eeee95d9742f 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -23,11 +23,12 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java index 7dcb832b9b4ed79d0c4601322632e47218d22263..feac9fa76b215761fc46b5c7719271c101d5b93a 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentManager.java +++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java @@ -29,13 +29,14 @@ import android.content.res.TypedArray; import android.content.res.XmlResourceParser; import android.os.UserHandle; import android.service.trust.TrustAgentService; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Log; import android.util.Slog; import android.util.Xml; +import androidx.annotation.VisibleForTesting; + import com.android.internal.widget.LockPatternUtils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/security/trustagent/TrustAgentSettings.java b/src/com/android/settings/security/trustagent/TrustAgentSettings.java index 02d354a78fd3d00d913174bb9e4f3a6c4cbe6917..c7988981155f640862db62bef0b61f470bc0509c 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentSettings.java +++ b/src/com/android/settings/security/trustagent/TrustAgentSettings.java @@ -28,12 +28,13 @@ import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; import android.service.trust.TrustAgentService; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; diff --git a/src/com/android/settings/shortcut/CreateShortcut.java b/src/com/android/settings/shortcut/CreateShortcut.java index 78969fed3e2ad1839598a81fb952e499b232c5ef..9fce3bafd0db233fba48a8a8da92200264723ac6 100644 --- a/src/com/android/settings/shortcut/CreateShortcut.java +++ b/src/com/android/settings/shortcut/CreateShortcut.java @@ -33,7 +33,6 @@ import android.graphics.drawable.Icon; import android.graphics.drawable.LayerDrawable; import android.net.ConnectivityManager; import android.os.AsyncTask; -import androidx.annotation.VisibleForTesting; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; @@ -41,6 +40,8 @@ import android.view.View.MeasureSpec; import android.widget.ImageView; import android.widget.ListView; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Settings.TetherSettingsActivity; diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index ebf34e5ca7c9b43995e50fc652ced7ebd7c4ec51..6806f9f08578108fb39786956e23288ce6aa20ef 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -23,13 +23,13 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.provider.Settings; -import androidx.core.app.NotificationCompat; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.util.Log; +import androidx.core.app.NotificationCompat; + import com.android.internal.telephony.IccCardConstants; import com.android.settings.R; import com.android.settings.Settings.SimSettingsActivity; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index b0cf194e04dd8aae972aaa493108bca2512a6165..e3858f4b28f41695e64afcf40ef2b8b793c13427 100644 --- a/src/com/android/settings/sim/SimSettings.java +++ b/src/com/android/settings/sim/SimSettings.java @@ -23,8 +23,6 @@ import android.graphics.drawable.BitmapDrawable; import android.os.Bundle; import android.os.SystemProperties; import android.provider.SearchIndexableResource; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; import android.telephony.PhoneNumberUtils; @@ -35,6 +33,9 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.TelephonyProperties; import com.android.settings.R; diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index 4b9a7eced9527e14c77efa1312bf0d47870c3a32..2b670a78ec34045152d5f01bff296dff752fa679 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -26,13 +26,16 @@ import android.net.Uri; import android.os.StrictMode; import android.provider.Settings; import android.provider.SettingsSlicesContract; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; import android.util.KeyValueListParser; import android.util.Log; import android.util.Pair; +import androidx.annotation.VisibleForTesting; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; + import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.core.BasePreferenceController; import com.android.settings.location.LocationSliceBuilder; @@ -54,9 +57,6 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.concurrent.ConcurrentHashMap; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; - /** * A {@link SliceProvider} for Settings to enabled inline results in system apps. * diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index d81734a974d18690a7095f8b8f3c4d9c00fb9e16..7065c5dc200d864eb25ce1246be1e717e87866a3 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -22,8 +22,8 @@ import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CH import static com.android.settings.slices.SettingsSliceProvider.ACTION_TOGGLE_CHANGED; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; -import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED; import static com.android.settings.wifi.WifiSliceBuilder.ACTION_WIFI_SLICE_CHANGED; +import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED; import android.app.slice.Slice; import android.content.BroadcastReceiver; diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java index baac3b620fbddeb0deb5bc46ef666467de6fb3bb..889579f06b697e7af5c76447345b0bbf7bb7e218 100644 --- a/src/com/android/settings/slices/SliceBuilderUtils.java +++ b/src/com/android/settings/slices/SliceBuilderUtils.java @@ -16,11 +16,7 @@ package com.android.settings.slices; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; -import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; -import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_KEY; import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; @@ -30,12 +26,16 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.text.TextUtils; import android.util.Log; import android.util.Pair; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -46,20 +46,13 @@ import com.android.settings.core.SliderPreferenceController; import com.android.settings.core.TogglePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.DatabaseIndexingUtils; -import com.android.settingslib.SliceBroadcastRelay; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.core.graphics.drawable.IconCompat; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - /** * Utility class to build Slices objects and Preference Controllers based on the Database managed diff --git a/src/com/android/settings/slices/SliceData.java b/src/com/android/settings/slices/SliceData.java index 689108a0077773fcf9b4cd9d488040bf78b772d0..72729a842f7889ac725b4bf8b17128e04d6dd986 100644 --- a/src/com/android/settings/slices/SliceData.java +++ b/src/com/android/settings/slices/SliceData.java @@ -22,7 +22,6 @@ import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import java.util.List; /** * Data class representing a slice stored by {@link SlicesIndexer}. diff --git a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java index 4f8ed96b9a515335d04c928c9d667e84cd29bda2..60a96aeaaddb581d5e289db9a193a9d18433eaac 100644 --- a/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java +++ b/src/com/android/settings/slices/SliceDeepLinkSpringBoard.java @@ -24,9 +24,7 @@ import android.util.Log; import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; -import com.android.settings.overlay.FeatureFactory; import com.android.settings.wifi.WifiSliceBuilder; -import com.android.settings.wifi.calling.WifiCallingSliceHelper; import java.net.URISyntaxException; diff --git a/src/com/android/settings/slices/SlicesDatabaseAccessor.java b/src/com/android/settings/slices/SlicesDatabaseAccessor.java index b14a716acab980e97bdf0b35ecef7ab6c914ad86..79d3bc6f0077e9a65a87cc411834caa26deac75c 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -18,22 +18,21 @@ package com.android.settings.slices; import static com.android.settings.slices.SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX; +import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; - -import android.content.Context; import android.os.Binder; import android.util.Pair; +import androidx.slice.Slice; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; - /** * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice. */ diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java index d4b71cfbbd21cb6dae5a949a406bcfb71e5d006c..f1628e766ce290cb10fcd7cb0ddc7f765feb54bd 100644 --- a/src/com/android/settings/slices/SlicesDatabaseHelper.java +++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java @@ -17,13 +17,13 @@ package com.android.settings.slices; import android.content.Context; - import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import java.util.Locale; /** diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index 704d8d6b074be643e1be5f4cc86d12b7af9ea399..f88af8fe8f491c3b7e1e04b43d6a7b8a701a7311 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -19,12 +19,12 @@ package com.android.settings.slices; import android.content.ContentValues; import android.content.Context; import android.database.sqlite.SQLiteDatabase; -import androidx.annotation.VisibleForTesting; import android.util.Log; -import com.android.settings.dashboard.DashboardFragment; +import androidx.annotation.VisibleForTesting; import com.android.settings.core.BasePreferenceController; +import com.android.settings.dashboard.DashboardFragment; import com.android.settings.overlay.FeatureFactory; import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns; import com.android.settings.slices.SlicesDatabaseHelper.Tables; diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index 119fadbd4ba952d7246f915b12066ccbf71be438..ded8604a58ed48aafd82ec53eff64aa23740f1ab 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -37,13 +37,14 @@ import android.media.MediaRouter; import android.media.MediaRouter.Callback; import android.os.Handler; import android.os.Looper; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.FeatureFlagUtils; import android.util.Log; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.bluetooth.Utils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java index fdbf610802c5585946f8f6261d28b7fc9cf4af2e..b18130a68637ae50a68f1a0e9d0da0e3f0ecbeeb 100644 --- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java +++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java @@ -20,13 +20,13 @@ import static android.bluetooth.IBluetoothHearingAid.HI_SYNC_ID_INVALID; import static android.media.AudioManager.STREAM_VOICE_CALL; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; -import com.android.settingslib.Utils; - import android.bluetooth.BluetoothDevice; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; +import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index bf9e37f9039acfc28d4135285c49fe89b9b4c658..8989de3c65bfe58cea2e3fb66b3ad16bf8b04694 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -21,14 +21,14 @@ import static android.media.AudioManager.STREAM_MUSIC; import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; -import com.android.settingslib.Utils; - import android.bluetooth.BluetoothDevice; import android.content.Context; import android.media.AudioManager; + import androidx.preference.Preference; import com.android.settings.R; +import com.android.settingslib.Utils; import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.HearingAidProfile; diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java index 1ec566e01bf53d80d76e25e07966cc658bc87b56..4cf657288f8730587b4f7b13539230b2695ff2ca 100644 --- a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java +++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java @@ -25,12 +25,13 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider; import com.android.settings.overlay.FeatureFactory; diff --git a/src/com/android/settings/survey/SurveyMixin.java b/src/com/android/settings/survey/SurveyMixin.java index 9b7a9df0c73b21bb584ddf120bdb3a974bb42523..552ed92953b34baaf9475e98159e767cf0cc898e 100644 --- a/src/com/android/settings/survey/SurveyMixin.java +++ b/src/com/android/settings/survey/SurveyMixin.java @@ -18,6 +18,7 @@ package com.android.settings.survey; import android.app.Activity; import android.app.Fragment; import android.content.BroadcastReceiver; + import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.SurveyFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java index 62be5ffd0dbd4a8c8b143188136d8ececabaa6ef..a493bcd75ee6138115d74510e89bfe1d68efdd90 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -18,6 +18,7 @@ package com.android.settings.system; import android.content.Context; import android.os.Bundle; import android.provider.SearchIndexableResource; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index 54ab924a5784843fda64818c9a77aa5362eebbf0..dd044092c4bbc2ad1ba9334cfd7f7c63c78e84fd 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -25,12 +25,13 @@ import android.os.Bundle; import android.os.PersistableBundle; import android.os.SystemUpdateManager; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 95ac8f50fc8691fd061c8aaa6595620cad51483a..d0a086e20d339197f3113a5e803adf4e471c9a2d 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -31,12 +31,13 @@ import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; import android.speech.tts.TtsEngines; import android.speech.tts.UtteranceProgressListener; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.util.Pair; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index a5cb1fd365558417d845c428583363a01f5f115d..e073b7184169a9266f75a11e92bb7815fc316985 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -21,13 +21,14 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.speech.tts.TextToSpeech.EngineInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.widget.Checkable; import android.widget.CompoundButton; import android.widget.RadioButton; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 2b35a59692804d46397dadbc96cf26af82b31e3b..9a78876053adcb8794f0cfcef91a521e4e8897d7 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -1,25 +1,28 @@ package com.android.settings.tts; -import android.speech.tts.TextToSpeech; -import com.android.settings.R; +import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; + +import android.content.Context; import android.os.Bundle; -import com.android.settings.SettingsPreferenceFragment; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import androidx.preference.PreferenceCategory; -import android.speech.tts.TtsEngines; +import android.provider.SearchIndexableResource; +import android.speech.tts.TextToSpeech; import android.speech.tts.TextToSpeech.EngineInfo; -import com.android.settings.SettingsActivity; -import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState; -import android.widget.Checkable; +import android.speech.tts.TtsEngines; import android.util.Log; -import static android.provider.Settings.Secure.TTS_DEFAULT_SYNTH; -import com.android.settings.search.Indexable; +import android.widget.Checkable; + +import androidx.preference.PreferenceCategory; + +import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; +import com.android.settings.SettingsActivity; +import com.android.settings.SettingsPreferenceFragment; import com.android.settings.search.BaseSearchIndexProvider; -import android.content.Context; -import android.provider.SearchIndexableResource; +import com.android.settings.search.Indexable; +import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState; -import java.util.List; import java.util.Arrays; +import java.util.List; public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements implements RadioButtonGroupState, Indexable { diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index bebc2d73b062859c97a2f2a69b46575dd4a78391..24773e7a9b51ea932f8866424a095e1996a2c0a2 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.users; import android.content.Context; import android.provider.Settings.Global; + import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index db132426711ac922106f4e8d02c61966f1457f78..a4e0cff5c3abf654f2776b88c0ec00bda8e6a698 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -36,14 +36,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceViewHolder; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -52,6 +44,15 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 42de8921463d2f912340a0bfe2e0b0e48461be0b..f73c6debd15dffddcd3f0386c75c5b7cfbc394e3 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -26,10 +26,11 @@ import android.os.Bundle; import android.os.Process; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java index 9368b81353a61067f2a11c0a662fbac178eabff7..a13c7702dc70bd5b113a472f39f28b974d51af9b 100644 --- a/src/com/android/settings/users/EditUserPhotoController.java +++ b/src/com/android/settings/users/EditUserPhotoController.java @@ -38,7 +38,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.provider.ContactsContract.DisplayPhoto; import android.provider.MediaStore; -import androidx.core.content.FileProvider; import android.util.Log; import android.view.Gravity; import android.view.View; @@ -50,6 +49,8 @@ import android.widget.ImageView; import android.widget.ListPopupWindow; import android.widget.TextView; +import androidx.core.content.FileProvider; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.drawable.CircleFramedDrawable; diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java index a5cecde4b607a8cc9127aad997ca9b1871d7ca5f..4d4a2dd5ae03f9e0746f0d53e1b0920c8038d7af 100644 --- a/src/com/android/settings/users/RestrictionUtils.java +++ b/src/com/android/settings/users/RestrictionUtils.java @@ -22,7 +22,6 @@ import android.content.res.Resources; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import android.provider.Settings.Secure; import com.android.settings.R; diff --git a/src/com/android/settings/users/UserCapabilities.java b/src/com/android/settings/users/UserCapabilities.java index f1bfae90c97551dab00c3d9fae026fab5ca46be7..aca3e493a3d90e3b503e47dbaa749871baa3393d 100644 --- a/src/com/android/settings/users/UserCapabilities.java +++ b/src/com/android/settings/users/UserCapabilities.java @@ -22,6 +22,7 @@ import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import com.android.settings.Utils; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index d18e2ea5bf333f1567f62865979a620b23fa8774..65868e9653a790ca6f8d57c98ba96fbf87c13350 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -23,8 +23,9 @@ import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java index 391e13a7065e7194593456438180e7bf47a598c8..bcc016750775ecfc0b02532122536015a777dfed 100644 --- a/src/com/android/settings/users/UserPreference.java +++ b/src/com/android/settings/users/UserPreference.java @@ -20,12 +20,13 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java index 5e88895d3eee3b80e89c21d405696b48070fafd8..56a921c982cce17c20984cbb1e5425be2e57588b 100644 --- a/src/com/android/settings/users/UserSettings.java +++ b/src/com/android/settings/users/UserSettings.java @@ -43,12 +43,6 @@ import android.os.UserManager; import android.provider.ContactsContract; import android.provider.SearchIndexableResource; import android.provider.Settings.Global; -import androidx.annotation.VisibleForTesting; -import androidx.annotation.WorkerThread; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.util.SparseArray; import android.view.Menu; @@ -58,6 +52,13 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.SimpleAdapter; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.util.UserIcons; import com.android.internal.widget.LockPatternUtils; diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 71f52f83536d886d459888222a020c857e60840e..6a05e91bef22926ba2b63cf589547cf5f7520fd1 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -30,12 +30,13 @@ import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.util.IconDrawableFactory; import android.util.Log; import android.view.View; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java index 32844d5ee711c36719e92ad8f7047c9d58df328d..85cd9617b98561ab7b650706ea804b679932a412 100644 --- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java +++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java @@ -17,6 +17,7 @@ package com.android.settings.utils; import android.content.Context; + import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; diff --git a/src/com/android/settings/utils/ZenServiceListing.java b/src/com/android/settings/utils/ZenServiceListing.java index 40a4f34dfaeca592389ae1d2f3779475fd3b129e..e87cc51f2c2bc13b2ba66f82c6c79e0261dc819e 100644 --- a/src/com/android/settings/utils/ZenServiceListing.java +++ b/src/com/android/settings/utils/ZenServiceListing.java @@ -18,19 +18,15 @@ package com.android.settings.utils; import android.app.ActivityManager; import android.app.NotificationManager; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; -import android.provider.Settings; -import android.text.TextUtils; import android.util.ArraySet; import android.util.Slog; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Set; diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java index 1d77caf9b6222839568af9b71227ccd5f256d35e..365fd9a5dfa61fcd57f891b86de8832f0fd3b0fb 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -34,10 +34,11 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; +import androidx.preference.Preference; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.net.VpnConfig; diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java index fc06b1e1129729cc0a0b70a02d11abf3f48bcd0a..6b64250df327f5a500b8b71e89fd764ea0f64545 100644 --- a/src/com/android/settings/vpn2/AppPreference.java +++ b/src/com/android/settings/vpn2/AppPreference.java @@ -21,6 +21,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.internal.net.LegacyVpnInfo; diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java index 5aa10b94d1f6541c21f01bfd3e4eaba336acd263..00b22bb2fb307f90f053bf0d382083556be4f68e 100644 --- a/src/com/android/settings/vpn2/ConfigDialogFragment.java +++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java @@ -18,7 +18,6 @@ package com.android.settings.vpn2; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.net.ConnectivityManager; @@ -35,7 +34,6 @@ import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.net.LegacyVpnInfo; -import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java index 2e0914ed4e34839b553d4963e453cd7dcd208b9d..d4b26776eb42639f40ef14d6718970664d2df1c9 100644 --- a/src/com/android/settings/vpn2/ConfirmLockdownFragment.java +++ b/src/com/android/settings/vpn2/ConfirmLockdownFragment.java @@ -15,10 +15,9 @@ */ package com.android.settings.vpn2; -import android.app.Fragment; import android.app.AlertDialog; import android.app.Dialog; -import android.app.DialogFragment; +import android.app.Fragment; import android.content.DialogInterface; import android.os.Bundle; diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java index 1f06a958eae79c99d8465e2108a78ccfb20c083f..e44a0570fa75e3260b3ea02ed0a49073586c0af2 100644 --- a/src/com/android/settings/vpn2/LegacyVpnPreference.java +++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java @@ -19,10 +19,11 @@ package com.android.settings.vpn2; import static com.android.internal.net.LegacyVpnInfo.STATE_CONNECTED; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; import android.view.View; +import androidx.preference.Preference; + import com.android.internal.net.VpnProfile; import com.android.settings.R; diff --git a/src/com/android/settings/vpn2/ManageablePreference.java b/src/com/android/settings/vpn2/ManageablePreference.java index 11da75854163509209965ad3b8f95f1199bb97d2..68971f2f2fb7377e2f640d44a21c1b9f65b492fc 100644 --- a/src/com/android/settings/vpn2/ManageablePreference.java +++ b/src/com/android/settings/vpn2/ManageablePreference.java @@ -23,8 +23,8 @@ import android.os.UserManager; import android.text.TextUtils; import android.util.AttributeSet; -import com.android.settings.widget.GearPreference; import com.android.settings.R; +import com.android.settings.widget.GearPreference; /** * This class sets appropriate enabled state and user admin message when userId is set diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java index f6444bf6437055babc84e28af74640d7bacb489b..6d87707ed4b82930a5b886770ea69ecaca3e9136 100644 --- a/src/com/android/settings/vpn2/VpnSettings.java +++ b/src/com/android/settings/vpn2/VpnSettings.java @@ -16,6 +16,8 @@ package com.android.settings.vpn2; +import static android.app.AppOpsManager.OP_ACTIVATE_VPN; + import android.annotation.UiThread; import android.annotation.WorkerThread; import android.app.Activity; @@ -40,8 +42,6 @@ import android.os.UserHandle; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.ArrayMap; import android.util.ArraySet; import android.util.Log; @@ -49,6 +49,9 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -71,8 +74,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static android.app.AppOpsManager.OP_ACTIVATE_VPN; - /** * Settings screen listing VPNs. Configured VPNs and networks managed by apps * are shown in the same list. diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 80910a1ea592d558113a1c27c98ee03c860cd9b9..5a12e1b76abe55a192df84f7bacc9aa6fdc1c750 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -22,6 +22,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; + import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; diff --git a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java index 73a58fee0680ae3f30030df0ac35c21e5361120e..ff3029e3697e327e6d781841ec5b80d65496ce9b 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypeSettings.java +++ b/src/com/android/settings/wallpaper/WallpaperTypeSettings.java @@ -22,6 +22,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java index 6a8ab50681354721a9810afb8d8dd35374fb0764..e6b57a43f4fcd62f3eb7ca5d826272ffcd430411 100644 --- a/src/com/android/settings/webview/WebViewAppPicker.java +++ b/src/com/android/settings/webview/WebViewAppPicker.java @@ -25,10 +25,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.webkit.UserPackage; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.applications.defaultapps.DefaultAppPickerFragment; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 5ab0bcbe807617902016300c6729e45128c0f90f..f102d64325a6648a558bbf550e4eca156673f0d3 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -39,14 +39,6 @@ import android.os.Handler; import android.os.Looper; import android.provider.SearchIndexableResource; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; -import androidx.preference.PreferenceViewHolder; import android.util.Slog; import android.util.TypedValue; import android.view.Menu; @@ -59,6 +51,15 @@ import android.widget.EditText; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.internal.app.MediaRouteDialogPresenter; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java index cb5e38dcb62ab9d147668d41bb050202697203ec..1b8d3192a4a1faca1af9003cae74a97e92336d69 100644 --- a/src/com/android/settings/widget/ActionBarShadowController.java +++ b/src/com/android/settings/widget/ActionBarShadowController.java @@ -18,9 +18,10 @@ package com.android.settings.widget; import android.app.ActionBar; import android.app.Activity; +import android.view.View; + import androidx.annotation.VisibleForTesting; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java index 64a01c7e178f6ec47581bb1da73bded06ea82669..347a784b2bade191a1491fa519600b494a04d7da 100644 --- a/src/com/android/settings/widget/ActionButtonPreference.java +++ b/src/com/android/settings/widget/ActionButtonPreference.java @@ -17,14 +17,15 @@ package com.android.settings.widget; import android.content.Context; -import androidx.annotation.StringRes; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class ActionButtonPreference extends Preference { diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java index 23ee894b8d90ee9fc576709ca31f1e4a952cde09..e779d403b0858d5db646b1d9a49ef6e71c0cad56 100644 --- a/src/com/android/settings/widget/AppCheckBoxPreference.java +++ b/src/com/android/settings/widget/AppCheckBoxPreference.java @@ -17,9 +17,10 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.CheckBoxPreference; import android.util.AttributeSet; +import androidx.preference.CheckBoxPreference; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java index 3b716a31b901f260beb43995a85cfa650f3f6886..91e700a098010d03046a8af2f96aab01c6714f06 100644 --- a/src/com/android/settings/widget/AppPreference.java +++ b/src/com/android/settings/widget/AppPreference.java @@ -16,13 +16,14 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.ProgressBar; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class AppPreference extends Preference { diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java index b42bb3db253b51ab4dbd60e626ccf4fc11c8b4c7..288096e7f80648648e99d801eb27ca1b1ae7ca11 100644 --- a/src/com/android/settings/widget/AppSwitchPreference.java +++ b/src/com/android/settings/widget/AppSwitchPreference.java @@ -17,11 +17,12 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.view.View; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.settings.R; public class AppSwitchPreference extends SwitchPreference { diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java index 5eab257ffaa71c0b8df40b0a306c4976f43db5ca..aa3d3c4ea1c8c27f32dd3045128368b376529dfc 100644 --- a/src/com/android/settings/widget/AspectRatioFrameLayout.java +++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java @@ -16,10 +16,11 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.widget.FrameLayout; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/ChartDataUsageView.java b/src/com/android/settings/widget/ChartDataUsageView.java index 2d9fe6fdcd9848888fa22a9cb3b09d2cee69ae5a..d1ddc14b40c970c1f76ba5d3f9f6d8e0629c70ce 100644 --- a/src/com/android/settings/widget/ChartDataUsageView.java +++ b/src/com/android/settings/widget/ChartDataUsageView.java @@ -16,6 +16,8 @@ package com.android.settings.widget; +import static android.net.TrafficStats.MB_IN_BYTES; + import android.content.Context; import android.content.res.Resources; import android.net.NetworkPolicy; @@ -42,8 +44,6 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Objects; -import static android.net.TrafficStats.MB_IN_BYTES; - /** * Specific {@link ChartView} that displays {@link ChartNetworkSeriesView} along * with {@link ChartSweepView} for inspection ranges and warning/limits. diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java index b456a4973388d6b2cc379b5c489d736202377068..de794823ceb3fa187f3fec1e96b738affe6bfddd 100644 --- a/src/com/android/settings/widget/ChartGridView.java +++ b/src/com/android/settings/widget/ChartGridView.java @@ -16,6 +16,8 @@ package com.android.settings.widget; +import static com.android.settings.Utils.formatDateRange; + import android.content.Context; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -32,8 +34,6 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.settings.R; -import static com.android.settings.Utils.formatDateRange; - /** * Background of {@link ChartView} that renders grid lines as requested by * {@link ChartAxis#getTickPoints()}. diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java index 07c147924f612c14f812508ebbace7259472c11b..7aaba6626a12dc9e75e25b079c4ee674b6f01a2a 100644 --- a/src/com/android/settings/widget/ChartNetworkSeriesView.java +++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java @@ -16,6 +16,9 @@ package com.android.settings.widget; +import static android.text.format.DateUtils.DAY_IN_MILLIS; +import static android.text.format.DateUtils.WEEK_IN_MILLIS; + import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; @@ -33,9 +36,6 @@ import android.view.View; import com.android.internal.util.Preconditions; import com.android.settings.R; -import static android.text.format.DateUtils.DAY_IN_MILLIS; -import static android.text.format.DateUtils.WEEK_IN_MILLIS; - /** * {@link NetworkStatsHistory} series to render inside a {@link ChartView}, * using {@link ChartAxis} to map into screen coordinates. diff --git a/src/com/android/settings/widget/DisabledCheckBoxPreference.java b/src/com/android/settings/widget/DisabledCheckBoxPreference.java index 3966864b1eeac87cf22ff0cda33bfaf4130f5fa6..be6deb3a0be638dd3322a5b6beb233f0a29de347 100644 --- a/src/com/android/settings/widget/DisabledCheckBoxPreference.java +++ b/src/com/android/settings/widget/DisabledCheckBoxPreference.java @@ -18,11 +18,12 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.preference.CheckBoxPreference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceViewHolder; + /** * A CheckboxPreference that can disable its checkbox separate from its text. * Differs from CheckboxPreference.setDisabled() in that the text is not dimmed. diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java index 32b994aefac121bcc8362276440d54d24f63dbfe..315d380f938472c605a359006a5f6be071d20f69 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -25,7 +25,6 @@ import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; import android.graphics.Typeface; import android.icu.text.DecimalFormatSymbols; -import androidx.annotation.ColorRes; import android.text.Layout; import android.text.Spannable; import android.text.SpannableString; @@ -37,6 +36,8 @@ import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.view.View; +import androidx.annotation.ColorRes; + import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/widget/DotsPageIndicator.java b/src/com/android/settings/widget/DotsPageIndicator.java index 096338bbbf00491f01c65e44fc00461aab25c8d2..88e695105a1e01aaa833a0162877cda868eb68b2 100644 --- a/src/com/android/settings/widget/DotsPageIndicator.java +++ b/src/com/android/settings/widget/DotsPageIndicator.java @@ -30,10 +30,12 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; import android.os.Build; -import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; import android.view.animation.Interpolator; + +import androidx.viewpager.widget.ViewPager; + import com.android.settings.R; import java.util.Arrays; diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 0f3a8b066fd4fbb952fbcff7cb15054f1969248b..e2e803f4372a9965c992d59f3c34bad83bc908eb 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -31,9 +31,6 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.util.IconDrawableFactory; import android.util.Log; @@ -43,6 +40,10 @@ import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.applications.AppInfoBase; diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java index 7187c7b6ee518b580194a42747396bfe931b6d3a..534ab08a69928ddf636ab24aa36bc0097a529a22 100644 --- a/src/com/android/settings/widget/FixedLineSummaryPreference.java +++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java @@ -16,11 +16,13 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils.TruncateAt; import android.util.AttributeSet; import android.widget.TextView; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index 200156b1cdbeacc3f3fa16b7b511e1ab4f765a7a..0a3010066986ae82fcbe278ada43545fdb291eec 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -17,10 +17,11 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedPreference; diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java index 3a5548ea7a3aa988a28a6d721fe619f4bc2f05da..313a204e5b60ee8d9b2e6c3483b20663f4d4be44 100644 --- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -25,16 +25,17 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Color; import android.os.Bundle; +import android.text.TextUtils; +import android.util.Log; +import android.util.TypedValue; +import android.view.View; + import androidx.annotation.VisibleForTesting; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceGroupAdapter; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; -import android.text.TextUtils; -import android.util.Log; -import android.util.TypedValue; -import android.view.View; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java index b249b9938560ed4dd7b2f4dd15bb1477c965a401..3d75b94f9cec9544dfbb4275572b9615639a944e 100644 --- a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java +++ b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java @@ -19,10 +19,8 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.net.wifi.WifiConfiguration; -import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.View; import android.widget.Button; @@ -30,6 +28,8 @@ import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.LinearLayout; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settingslib.CustomDialogPreference; diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java index 7725283e0c4392f5872cd0b48317d4ef67652faf..14c3d7db012686d9e3924c93d0465d9b329d6c18 100644 --- a/src/com/android/settings/widget/LabeledSeekBar.java +++ b/src/com/android/settings/widget/LabeledSeekBar.java @@ -17,12 +17,8 @@ package com.android.settings.widget; import android.content.Context; -import android.content.res.Configuration; import android.graphics.Rect; import android.os.Bundle; -import androidx.core.view.ViewCompat; -import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; -import androidx.customview.widget.ExploreByTouchHelper; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; @@ -31,6 +27,10 @@ import android.widget.RadioButton; import android.widget.RadioGroup; import android.widget.SeekBar; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.customview.widget.ExploreByTouchHelper; + import java.util.List; /** diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java index 8fe59e8b9a9b9d9994c6c338ef8ecbbe746b5a80..48e09c9a6cc87c5f3de70d9ca183bb64d4692d2f 100644 --- a/src/com/android/settings/widget/MasterCheckBoxPreference.java +++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java @@ -17,12 +17,13 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.CheckBox; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java index 1244d33651537ad0847ccb6a1ccbf929adb7edc2..91595848bdc13ee143385880758e9bd76e9e2f0c 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/MasterSwitchController.java @@ -17,7 +17,7 @@ package com.android.settings.widget; import androidx.preference.Preference; -import android.widget.Switch; + import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /* diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java index 765eae1293abedf18f5cf3a49cf577bc22921e2e..42529cfd4d07a97d84deb12c41ff9019ba12b121 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -17,12 +17,13 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.view.View.OnClickListener; import android.widget.Switch; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.TwoTargetPreference; diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 8142d0bc7163f09e448e05c2d7acd7175c9f61a2..89df487200ec725fd567d607d56181045a72633d 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -20,16 +20,17 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.LayoutRes; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.ArrayMap; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.LayoutRes; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index 9b5c17007088362cf96d49fcf4f56bd3b8aacc55..ed7f905312187e8d6798a3568510749c15f0373a 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -17,14 +17,15 @@ package com.android.settings.widget; import android.content.Context; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.CheckBoxPreference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index 9518c693e30d05c5f10aefe1b54e536e345f4891..e33c34287daa118e40905480b80dfa4bdb5abe78 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -18,12 +18,13 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserHandle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java index ac28e7bf4cb1ce974a156d12575b535844ea6853..68caaa78ea5027d19ff1602aadc8a9c4e38ba9d3 100644 --- a/src/com/android/settings/widget/RtlCompatibleViewPager.java +++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java @@ -17,12 +17,13 @@ package com.android.settings.widget; import android.content.Context; +import android.os.Parcel; import android.os.Parcelable; -import androidx.viewpager.widget.ViewPager; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; -import android.os.Parcel; + +import androidx.viewpager.widget.ViewPager; import java.util.Locale; diff --git a/src/com/android/settings/widget/ScrollToParentEditText.java b/src/com/android/settings/widget/ScrollToParentEditText.java index 705e918ea5e9b56c6864936f37ff5d05d989f3e6..9d5394bb8fa992fef1a7757061ea1067df7730ca 100644 --- a/src/com/android/settings/widget/ScrollToParentEditText.java +++ b/src/com/android/settings/widget/ScrollToParentEditText.java @@ -21,9 +21,6 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.view.View; import android.view.ViewParent; -import android.widget.EditText; - -import com.android.settings.widget.ImeAwareEditText; /** * An EditText that, instead of scrolling to itself when focused, will request scrolling to its diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java index 2919b36ce592aa92e606f79fb7496432352f3eae..2c57bb31a94c29d7b5cfa12b7c52943f812a5b48 100644 --- a/src/com/android/settings/widget/SeekBarPreference.java +++ b/src/com/android/settings/widget/SeekBarPreference.java @@ -20,8 +20,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.Parcel; import android.os.Parcelable; -import androidx.core.content.res.TypedArrayUtils; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.KeyEvent; @@ -30,7 +28,9 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.settings.widget.DefaultIndicatorSeekBar; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.RestrictedPreference; /** diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java index adc386ac0c00f2358335c81ec0cfd0a28e9029dc..74108aa20d10fd54b8e58babf8f2684ba34ed8e2 100644 --- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java +++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java @@ -16,7 +16,6 @@ package com.android.settings.widget; -import android.app.ActivityManager; import android.app.PendingIntent; import android.appwidget.AppWidgetManager; import android.appwidget.AppWidgetProvider; @@ -33,14 +32,10 @@ import android.net.Uri; import android.net.wifi.WifiManager; import android.os.AsyncTask; import android.os.Handler; -import android.os.IPowerManager; import android.os.PowerManager; import android.os.Process; -import android.os.RemoteException; -import android.os.ServiceManager; import android.os.UserManager; import android.provider.Settings; -import android.provider.Settings.Secure; import android.util.Log; import android.widget.RemoteViews; diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java index ef024ef5a121d5e68b4bc8c86eba1cf8624c96ba..3ae4e3cc6c7b5db8a10e511669b58a9a1a314e93 100644 --- a/src/com/android/settings/widget/SlidingTabLayout.java +++ b/src/com/android/settings/widget/SlidingTabLayout.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import android.content.Context; -import androidx.viewpager.widget.PagerAdapter; import android.util.AttributeSet; import android.view.Gravity; import android.view.LayoutInflater; @@ -26,6 +25,8 @@ import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.viewpager.widget.PagerAdapter; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index 857075bfb5a17f556508fd3178cc467f96168782..52a3288dc5920887437701882cbf26dac49a37f3 100644 --- a/src/com/android/settings/widget/SwitchBar.java +++ b/src/com/android/settings/widget/SwitchBar.java @@ -23,9 +23,6 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.ColorInt; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.text.style.TextAppearanceSpan; @@ -39,6 +36,10 @@ import android.widget.LinearLayout; import android.widget.Switch; import android.widget.TextView; +import androidx.annotation.ColorInt; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.RestrictedLockUtils; diff --git a/src/com/android/settings/widget/SwitchBarController.java b/src/com/android/settings/widget/SwitchBarController.java index ede02afbeed312c1f9a83243953131b99fac2512..e471c7a1b70d816ea9b50e2152157f74ea072195 100644 --- a/src/com/android/settings/widget/SwitchBarController.java +++ b/src/com/android/settings/widget/SwitchBarController.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import android.widget.Switch; + import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; /* diff --git a/src/com/android/settings/widget/TwoStateButtonPreference.java b/src/com/android/settings/widget/TwoStateButtonPreference.java index 0f71268975fd9292c3c3d87ca08411a23b4e374f..b154fb4193c6742839d5a1ccaa4bc011188ffed9 100644 --- a/src/com/android/settings/widget/TwoStateButtonPreference.java +++ b/src/com/android/settings/widget/TwoStateButtonPreference.java @@ -18,12 +18,13 @@ package com.android.settings.widget; import android.content.Context; import android.content.res.TypedArray; -import androidx.annotation.VisibleForTesting; -import androidx.core.content.res.TypedArrayUtils; import android.util.AttributeSet; import android.view.View; import android.widget.Button; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java index 0243a6873e8ddb7a53e74b14c24a7757cc99ca99..9285c3d2c14181449766277dcd6d3ca80d773940 100644 --- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java +++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java @@ -18,10 +18,12 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.res.TypedArray; import android.os.Bundle; +import android.widget.ArrayAdapter; + import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceDialogFragment; import androidx.preference.ListPreference; -import android.widget.ArrayAdapter; +import androidx.preference.PreferenceDialogFragment; + import com.android.settingslib.core.instrumentation.Instrumentable; import java.util.ArrayList; diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index 8ffffb7f6565c3aaf38e044acbf2946c0e444579..ea2d04b948cf2cfd979980e6bdcbc62b0ae72604 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -18,18 +18,18 @@ package com.android.settings.widget; import android.app.AlertDialog; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceViewHolder; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + import com.android.settingslib.CustomEditTextPreference; /** diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java index 4ec98296e1bb0cb545be5de7967c98bdf00b9ea3..b5874b1bdc307d96d71d7aebb6bb4dc8858b994d 100644 --- a/src/com/android/settings/widget/VideoPreference.java +++ b/src/com/android/settings/widget/VideoPreference.java @@ -22,9 +22,6 @@ import android.content.res.TypedArray; import android.graphics.SurfaceTexture; import android.media.MediaPlayer; import android.net.Uri; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.Log; import android.view.Surface; @@ -32,6 +29,10 @@ import android.view.TextureView; import android.view.View; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java index 449916b6cfe237995a03ad5bfea5dbb90af09a5a..063b105dfb20b9a5c252a7fee835953e803358b3 100644 --- a/src/com/android/settings/widget/WorkOnlyCategory.java +++ b/src/com/android/settings/widget/WorkOnlyCategory.java @@ -16,9 +16,10 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceCategory; import android.util.AttributeSet; +import androidx.preference.PreferenceCategory; + import com.android.settings.SelfAvailablePreference; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java index c643b8ca05de5a51e352eb6c2c6cfbb7486c2214..19687fcfff16988487e98f94d7701e7af5245fb0 100644 --- a/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java +++ b/src/com/android/settings/wifi/AppStateChangeWifiStateBridge.java @@ -22,7 +22,6 @@ import android.content.Context; import com.android.internal.util.ArrayUtils; import com.android.settings.applications.AppStateAppOpsBridge; -import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppFilter; diff --git a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java index 2fefb43e7a10420b90ba9046816154d338684a09..a883826801fdfba4b12be09eb1f672f439e62f44 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -18,10 +18,11 @@ package com.android.settings.wifi; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 1c59ddd02b7090e1bdd9ad016238ab0002b1a94f..03e98208afb1c5b8e4fec6de4063eff0dd5b176a 100644 --- a/src/com/android/settings/wifi/ChangeWifiStateDetails.java +++ b/src/com/android/settings/wifi/ChangeWifiStateDetails.java @@ -16,28 +16,22 @@ package com.android.settings.wifi; -import android.Manifest.permission; import android.app.AlertDialog; import android.app.AppOpsManager; import android.content.Context; import android.os.Bundle; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; -import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import com.android.settings.R; import com.android.settings.applications.AppInfoWithHeader; import com.android.settings.applications.AppStateAppOpsBridge.PermissionState; -import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; - import com.android.settings.wifi.AppStateChangeWifiStateBridge.WifiSettingsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; -import com.android.settingslib.applications.ApplicationsState.AppFilter; - -import static android.app.AppOpsManager.MODE_ALLOWED; -import static android.app.AppOpsManager.MODE_IGNORED; public class ChangeWifiStateDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index 1e3723e3570ae067281b4b3ddc5626af1b28b3dc..3efbbff7f3be81481016c46f4501d14d3ce83736 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -17,9 +17,10 @@ package com.android.settings.wifi; import android.content.Context; +import android.view.View; + import androidx.annotation.DrawableRes; import androidx.preference.PreferenceViewHolder; -import android.view.View; import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index e4cb95bcebd99eb7e6c5c6988d33e554ab203b4e..033740a65c080643d4db108bbc583b62ee442171 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -17,14 +17,16 @@ package com.android.settings.wifi; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.Spannable; import android.text.method.LinkMovementMethod; import android.text.style.TextAppearanceSpan; import android.util.AttributeSet; import android.widget.TextView; + +import androidx.annotation.Nullable; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.LinkifyUtils; /** diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 213589b9de47111ae69f714a141b821d40c87665..ab7abf2a31b74cdf1d06cef749b590ba0f95f541 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,9 +17,9 @@ package com.android.settings.wifi; import android.app.Fragment; import android.content.Context; + import androidx.preference.PreferenceViewHolder; -import android.widget.ImageView; -import com.android.settings.R; + import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index baf273c21db512dc66d8aeec8daf9666e0d9df23..a46a82873a522479b4dd5d018d8290065f6361b2 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -22,10 +22,11 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java index c45db69ba04102bb1f4603febd52d4f6bdcfe8cb..25e7a6e69b527f81c2cf1d421fc2ea6ca05fef0a 100644 --- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java +++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java @@ -26,10 +26,12 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; -import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; + +import androidx.annotation.NonNull; + import com.android.internal.app.AlertActivity; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 25c97b203e011381bbec6fa5a7981c17c91e638c..56072c1c1b0ffb20b5a6ec5abe899559820c5f5b 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -24,11 +24,12 @@ import android.icu.text.Collator; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; +import android.util.Log; +import android.widget.Toast; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.Log; -import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 6bc2d98f796fadff07bc2e7a7b53fe545949d344..3b71037037b99f2807b881af532ead0f8442f679 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -13,11 +13,11 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 35f700de815623f8a65aca1c25e55e2c0e4d8ced..6d3c3b8ef4241c0700895aaac6cc2d8dee1be6af 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -22,11 +22,12 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.net.wifi.WifiManager; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.Editable; import android.widget.EditText; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 22de20c445c9e4c5d372ffcd05565ecab5eabec0..de67c10baac28ae447dd8b9c70b3aa805cbd52a4 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -34,11 +34,9 @@ import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiEnterpriseConfig.Eap; import android.net.wifi.WifiEnterpriseConfig.Phase2; import android.net.wifi.WifiInfo; -import android.os.Handler; import android.os.UserManager; import android.security.Credentials; import android.security.KeyStore; -import androidx.annotation.VisibleForTesting; import android.text.Editable; import android.text.InputType; import android.text.TextUtils; @@ -59,6 +57,8 @@ import android.widget.ScrollView; import android.widget.Spinner; import android.widget.TextView; +import androidx.annotation.VisibleForTesting; + import com.android.settings.ProxySelector; import com.android.settings.R; import com.android.settingslib.Utils; diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java index f7ddac7c6fc2786e9d04c53ab2a080a2ae4c4613..2567a429932d58b66c78146da029a6a1f756e4a0 100644 --- a/src/com/android/settings/wifi/WifiDetailPreference.java +++ b/src/com/android/settings/wifi/WifiDetailPreference.java @@ -17,12 +17,13 @@ package com.android.settings.wifi; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.TextView; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; /** diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 02ce0e4d4e8971dc45065a69ff40b1b56d7a6899..5d0dc69437ca0eca9014f851f3aa53bc0a0a973c 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -24,9 +24,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.net.wifi.WifiManager.ActionListener; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.settings.SetupWizardUtils; import com.android.settingslib.wifi.AccessPoint; import com.android.setupwizardlib.util.WizardManagerHelper; diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 018119b3e579a02deb28c02afd11cdcc8f440ffb..8efefc376285f69c965469786b8d424d61ae2224 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -28,9 +28,10 @@ import android.net.wifi.WifiManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchWidgetController; diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index ec17b08d121aa3a8403f1ef8ab9702b138a981e6..0676d96ce03f1a1cb5042f98130acbe8265d83c0 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -23,10 +23,11 @@ import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; +import android.text.TextUtils; + import androidx.core.text.BidiFormatter; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index cbbe8ba2c0175db4f213ba5fb13f782c7ce1ba7a..692608ccbe81430444fd864e4eff7db583ccd2b6 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -16,13 +16,14 @@ package com.android.settings.wifi; import android.content.Context; + import androidx.preference.PreferenceScreen; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.R; -import com.android.settings.widget.SummaryUpdater; -import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.MasterSwitchController; +import com.android.settings.widget.MasterSwitchPreference; +import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.lifecycle.LifecycleObserver; diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java index b175665a9434320f7d2bcb947dd5404c220e3f05..e12529d42d5196a48ac875d6d458b9c76c1ea8c9 100644 --- a/src/com/android/settings/wifi/WifiNoInternetDialog.java +++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java @@ -16,6 +16,10 @@ package com.android.settings.wifi; +import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION; +import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED; +import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; + import android.content.Context; import android.content.DialogInterface; import android.content.Intent; @@ -37,10 +41,6 @@ import com.android.internal.app.AlertActivity; import com.android.internal.app.AlertController; import com.android.settings.R; -import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION; -import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED; -import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED; - public final class WifiNoInternetDialog extends AlertActivity implements DialogInterface.OnClickListener { private static final String TAG = "WifiNoInternetDialog"; diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java index 51904418f8fc674ad92a5db3a89eb74ecf4fc660..079d90f158e7635e2f4145abdf41e8010cf4eea7 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import android.content.Intent; + import androidx.preference.PreferenceFragment; import com.android.settings.ButtonBarHandler; diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index 9db766cb3be1bd7754d445414af0770537825838..f1eafd047dd97df3758b5c25ba9cb036bbd264ad 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -25,11 +25,12 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 7aeaba656694f88f48ccbc7dadb587d939c13320..3d13d12a13bca26b05c9cd9b258f7c90af51c426 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -39,9 +39,6 @@ import android.os.Handler; import android.os.Looper; import android.os.PowerManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import android.util.Log; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; @@ -50,6 +47,10 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.LinkifyUtils; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java index 68aa9a5b8d3d901a3095bf87a5f00994379878b9..b2aabdfff4702acb6b8aff186d3c7ded17dead4f 100644 --- a/src/com/android/settings/wifi/WifiSliceBuilder.java +++ b/src/com/android/settings/wifi/WifiSliceBuilder.java @@ -19,8 +19,6 @@ package com.android.settings.wifi; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.provider.SettingsSlicesContract.KEY_WIFI; -import static androidx.slice.builders.ListBuilder.ICON_IMAGE; - import android.annotation.ColorInt; import android.app.PendingIntent; import android.content.ContentResolver; @@ -32,6 +30,12 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.provider.SettingsSlicesContract; +import android.text.TextUtils; + +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -39,14 +43,6 @@ import com.android.settings.SubSettings; import com.android.settings.Utils; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; - -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - -import androidx.core.graphics.drawable.IconCompat; -import android.text.TextUtils; /** * Utility class to build a Wifi Slice, and handle all associated actions. diff --git a/src/com/android/settings/wifi/WifiSummaryUpdater.java b/src/com/android/settings/wifi/WifiSummaryUpdater.java index d0b4f606946505088af280f6acef0c03b3fa4b62..86961132c42c3208204e0e3ed56ec934a3804a97 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -24,9 +24,10 @@ import android.net.ConnectivityManager; import android.net.NetworkScoreManager; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; +import androidx.annotation.VisibleForTesting; + import com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.wifi.WifiStatusTracker; diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java index fd9d27e9c20cd5071fad2453bd08365d0ef9d499..4ffc589834ef3fbc315dc104ff21613ae6684c1b 100644 --- a/src/com/android/settings/wifi/WifiUtils.java +++ b/src/com/android/settings/wifi/WifiUtils.java @@ -27,6 +27,7 @@ import android.provider.Settings; import android.text.TextUtils; import com.android.settingslib.wrapper.PackageManagerWrapper; + import java.nio.charset.StandardCharsets; public class WifiUtils { diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 0c088257abb8a5cabab191e451eef9040409ed6a..0dcdf54d70707e9516f4fb988742c36eef0c1231 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -24,11 +24,12 @@ import android.content.Context; import android.content.Intent; import android.location.LocationManager; import android.provider.Settings; +import android.text.TextUtils; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index a9c0ee9f54cae5153700a83347fd6a33c33460b5..ab04eca4afd8f84f21122f5e4360e3847fe68680 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettings.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettings.java @@ -19,7 +19,6 @@ package com.android.settings.wifi.calling; import android.app.Fragment; import android.app.FragmentManager; import android.os.Bundle; -import androidx.legacy.app.FragmentPagerAdapter; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.util.Log; @@ -27,6 +26,8 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.legacy.app.FragmentPagerAdapter; + import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 15137cc821a4fb90ffcbdbfa899f1c4986c626d2..76b5c7ae8a482e0229c02b91539e327f004653f6 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java @@ -25,10 +25,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.os.PersistableBundle; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.PhoneStateListener; import android.telephony.SubscriptionManager; @@ -41,6 +37,11 @@ import android.view.ViewGroup; import android.widget.Switch; import android.widget.TextView; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index a80e9d03c948165d31008bde9fe625f21f8ce8fd..e8e33ef053155539e3d5d5c870a214a7cd28bae0 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -26,13 +26,13 @@ import android.content.Intent; import android.net.Uri; import android.os.PersistableBundle; import android.provider.Settings; -import androidx.core.graphics.drawable.IconCompat; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; +import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index fda5ce49347e6b08c690ba8ec5e69c1cd06dce0f..f3460aff172cccdb3c9b7058b3afe7d400775f1a 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -40,15 +40,16 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; import android.widget.ImageView; import android.widget.Toast; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java index 097a49be3edbb776e65d11a73d5dea2a699a8957..341b2279994562d8a3fdacdf8d9fca99c5c9d1e8 100644 --- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java @@ -20,16 +20,12 @@ import android.app.backup.BackupManager; import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import android.provider.Settings; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.DropDownPreference; import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; /** diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java index fed363d9dc7a635cbb067e5f72e9f07e7fbf148e..ac8113bcc5bde9d77da7709b8737c8424aedafb9 100644 --- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.p2p; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java index 84ce1ee04c656b19e7f3fcdef08cee09086d9c2f..ade423a486a2d4d286a7d3347151129435456248 100644 --- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 5a087e527aac9cb173b88d59da753e9b79ab1330..6caef94c6fa666717df73d889a966557691d0efe 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -19,10 +19,12 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.WifiManager; import android.net.wifi.p2p.WifiP2pDevice; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.widget.ImageView; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; public class WifiP2pPeer extends Preference { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java index 4d2b43364a8230287c2cba8be9fcb13433736846..702942ca7fb316db77a1aeb9e3a06adee9015500 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPersistentGroup.java @@ -18,8 +18,8 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pGroup; + import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; public class WifiP2pPersistentGroup extends Preference { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index 78af007bdbd831e294f04017b1f0c05056f9fb30..4f3b7fd63b38df600e1ff82fb682cd680e51584f 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index 302981d9d6f85847163b3b3af1c9b455b5bddcf3..6afd03acf6d75fc7e20f78968da24d3646ad8e76 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -38,8 +38,6 @@ import android.net.wifi.p2p.WifiP2pManager.PeerListListener; import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener; import android.os.Bundle; import android.os.SystemProperties; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.InputFilter; import android.text.TextUtils; import android.util.Log; @@ -49,6 +47,9 @@ import android.view.MenuItem; import android.widget.EditText; import android.widget.Toast; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index 8dde24bdb476feb973650e3c1feca2b01118202b..fafcb037ae299affed3fb106adee51052237863f 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -23,9 +23,10 @@ import android.content.Context; import android.content.res.Resources; import android.icu.text.ListFormatter; import android.net.wifi.WifiConfiguration; -import androidx.preference.Preference; import android.util.Log; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.widget.HotspotApBandSelectionPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index d8c3cfd8a34464f8daade4b8ed491c2d5f103205..01a0b5707cb3d0c0fc6709e10cec576f9a5592a5 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -18,8 +18,9 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index e689916475d13425ea2dd1f08c762b9f85bce7e2..94e9209defbce007abd258aa2f045097d3b88725 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -19,6 +19,7 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index 465170a2c4675653806f2d079be5a6d111cc11c6..8d9e8586f44ba2f9fdead005e89075b65a146400 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -18,9 +18,10 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; +import android.text.TextUtils; + import androidx.preference.EditTextPreference; import androidx.preference.Preference; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.widget.ValidatedEditTextPreference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 3e0297e741b674b11f2fa6f72de62e4138b9cbf4..2ae6b586ae670e1c679fdb5b54be6a967035ed8f 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -24,10 +24,11 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; +import android.text.BidiFormatter; + import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.BidiFormatter; import com.android.settings.R; import com.android.settings.Utils; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index 176573f584615792e90b49fd3a72eaf991b25035..fb2ce97db6bd1ce31623f111eeb47ef457551731 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java @@ -18,13 +18,13 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; +import android.util.Log; + import androidx.annotation.VisibleForTesting; import androidx.preference.EditTextPreference; import androidx.preference.Preference; -import android.util.Log; import com.android.settings.widget.ValidatedEditTextPreference; -import com.android.settings.wifi.WifiUtils; public class WifiTetherSSIDPreferenceController extends WifiTetherBasePreferenceController implements ValidatedEditTextPreference.Validator { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java index 0f08cbb709aabeab0afc9d4e2ffcbf92dd6663fc..f97a20911eb1081089e72b9db6c9fc66c6ebc0a9 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -1,8 +1,8 @@ package com.android.settings.wifi.tether; import android.content.Context; -import android.content.res.Resources; import android.net.wifi.WifiConfiguration; + import androidx.preference.ListPreference; import androidx.preference.Preference; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 0de74043541dd6e10076bf075cc06a679b1d353f..7d9afde77bc83357587405149be4cc6b63be901d 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -27,9 +27,10 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import androidx.annotation.VisibleForTesting; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 554cc0e32021c1f35b6012aa3b0f9c4bc5eca4e4..8d87b3284b25300b2b8822ba4fbfc4455f1f8222 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -27,6 +27,7 @@ import android.net.wifi.WifiManager; import android.os.Handler; import android.os.Looper; import android.provider.Settings; + import androidx.annotation.VisibleForTesting; import com.android.settings.datausage.DataSaverBackend; diff --git a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java index 23639ff70ea59635e08e97c75a1182f18673a6ff..cfef3c26c3965a05698722f1293dfa82329c4936 100644 --- a/tests/robotests/src/com/android/settings/HelpTrampolineTest.java +++ b/tests/robotests/src/com/android/settings/HelpTrampolineTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.Shadows.shadowOf; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java index af0b757a1821ef8e913136e2dc21481207947768..3bd8d984c34a94726c68e51d9328cb530d3795da 100644 --- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java +++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java @@ -16,6 +16,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 64dab16118cf0bc8c8c4f3ddf963dc9e5b722b91..c693a5ff9c86ce0ee41ec2b54c64fe5f22039ebf 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java index 6ad520a66037dc3d7dde266ce79b2862bfd39637..f024e4c868459400b4983ad07476b6dbdb1028fe 100644 --- a/tests/robotests/src/com/android/settings/PrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/PrivacySettingsTest.java @@ -19,9 +19,9 @@ package com.android.settings; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java index 8753b1d39000846aaeb2331845a6fc906d422678..a10a4a41b10973dbf8e40e994f8e2c278f80326a 100644 --- a/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java +++ b/tests/robotests/src/com/android/settings/ResetNetworkConfirmTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 1cca84287614c74171052cf0eac76ebe45956b36..36256263eeb97cb7deb2a59152a73a8d61a72356 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -27,9 +28,11 @@ import android.app.KeyguardManager; import android.content.Intent; import android.os.Bundle; import android.util.AttributeSet; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.RestrictedPreferenceHelper; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java index e370cda5c96b8c36426229d25ba5ecdc1cd22415..35f9e2876ab4d4fcd8842fe3993bb0443ff68bd8 100644 --- a/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedSettingsFragmentTest.java @@ -15,8 +15,6 @@ */ package com.android.settings; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java index dc1fe2b223d8e3c36e9c10be0ec205884c871891..6015e2789e8141393f639d01bda1b744b9ae03b9 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -28,6 +28,7 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; + import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batterytip.AnomalyConfigJobService; diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java index f09723f507f26385dcfdfbe015d70bb57c397224..1c1c14ce0cc7339597213525944fb58264e0ce3d 100644 --- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java +++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java @@ -21,18 +21,20 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.content.pm.ShortcutInfo; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowShortcutManager; -import java.util.ArrayList; -import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowShortcutManager.class}) public class SettingsInitializeTest { diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java index 0e1384ddd71c4d0e9719e6f54a30eb833a3c73d0..8e35cfb3e56cc8758d1d80d699ca09b8e7a4e641 100644 --- a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java +++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index a7b91f5fb1fbde2dce1fae37f90b92b30d4ffaf0..2a32ed7fae9f4e2b1af0f6bf21e63ed0303fd68c 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -26,11 +27,12 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.Bundle; +import android.view.View; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.view.View; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java index f2bd79c4c6daf0a8b464744023e63d6b800ccb78..83a727258fedb2915b61e64e33e044fdda3f5b38 100644 --- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java +++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.android.settings.testutils.ResIdSubject.assertResId; + import static com.google.common.truth.Truth.assertThat; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 1b717772a6fe46e6aca2d5a276b2416bc7e54abe..3cb9c4c3da0b4c20399a65e8c579659ddb57a509 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -18,20 +18,21 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) diff --git a/tests/robotests/src/com/android/settings/UtilsTest.java b/tests/robotests/src/com/android/settings/UtilsTest.java index 92aedcfe6a693b60f88d1d1ae12ccfc92b0b0f5c..5f2abba37efd8b81a29efd226e7412a45d86ac45 100644 --- a/tests/robotests/src/com/android/settings/UtilsTest.java +++ b/tests/robotests/src/com/android/settings/UtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index 30debd623d2303b9f2b6c43e64cbbb81a9c5f314..0fbf4977eeaf8ea155c323068a38e42a1664dc41 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -21,12 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import android.content.Context; -import android.os.Bundle; import android.os.Vibrator; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; @@ -35,7 +34,6 @@ import com.android.settings.testutils.XmlTestUtils; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index 8392412e325a38761cce8810bbe2983f15508f31..b00d64d8eb5768dcec873fdb3c5fc7d395a71c2b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -37,15 +37,14 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import org.robolectric.shadow.api.Shadow; +import org.robolectric.shadows.ShadowAccessibilityManager; +import org.xmlpull.v1.XmlPullParserException; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.robolectric.shadow.api.Shadow; -import org.robolectric.shadows.ShadowAccessibilityManager; -import org.xmlpull.v1.XmlPullParserException; - @RunWith(SettingsRobolectricTestRunner.class) public class AccessibilitySlicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java index aad6454e99f97257a50ee5e4d6ba75db201db8a1..96b03236245e452ac177fcd91a35e1a56f92e830 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -18,9 +18,10 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index 98b1770668f50a0a3e2f630a193a3251c5dcba9c..020906aee5c211e9023e27ad97536d639c7a091a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 128e33bb351b8d0bd1928b8fd43b2736b43f25b6..968f3b1431452f389d9fdea9a228a7563190366f 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -27,6 +27,7 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index dda2ae5e780e68004ce993e8e670440e18b42778..3a7fd56b9c73e827be0bf4dd94d3b271fd073b09 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -17,15 +17,18 @@ package com.android.settings.accessibility; import static android.provider.Settings.System.NOTIFICATION_VIBRATION_INTENSITY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; import android.os.Vibrator; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java index 1fe64c7f4e1bedbcba28b9db20b14d8db11d9ed0..26b3a6c8e2c1781bc9f999b56a65631069d63c7a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index c1f54d605248e756df460cd0c3900929d36d41d6..6a22ac946a83efe844d19a59f87bd165762ee24a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -21,11 +21,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.os.Bundle; -import androidx.annotation.XmlRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.XmlRes; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index ecd2ff9ce57fcb313a2fa5bda47220834d5c94e7..a44b62ba0b49f645f08493d9bcbe1cc101a612f6 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -21,11 +21,12 @@ import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_MEDIUM; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_OFF; import static com.android.settings.accessibility.VibrationPreferenceFragment.KEY_INTENSITY_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.Context; import android.content.res.Resources; import android.os.UserManager; @@ -33,7 +34,8 @@ import android.os.Vibrator; import android.provider.Settings; import com.android.settings.R; -import com.android.settings.accessibility.VibrationPreferenceFragment.VibrationIntensityCandidateInfo; +import com.android.settings.accessibility.VibrationPreferenceFragment + .VibrationIntensityCandidateInfo; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.widget.CandidateInfo; @@ -41,7 +43,6 @@ import com.android.settingslib.widget.CandidateInfo; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java index ade7dc94ce59a00f706e96991c281ce7c3d6b87d..7c70f1df30cf367ad53a553295a88d80dc7a8915 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java @@ -15,9 +15,13 @@ */ package com.android.settings.accounts; -import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.LABELS; -import static com.android.settings.accounts.AccountDashboardFragmentTest.ShadowAuthenticationHelper.TYPES; +import static com.android.settings.accounts.AccountDashboardFragmentTest + .ShadowAuthenticationHelper.LABELS; +import static com.android.settings.accounts.AccountDashboardFragmentTest + .ShadowAuthenticationHelper.TYPES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java index 558e074160cfacf9d00a0d58b8e57163088e8f51..8cb30df6b0c599f9cba867700d727a8491643e77 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -30,6 +31,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.Bundle; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 59b0aeeb6ee0a5219c3569bd8b8af92d64afd960..fa049c67f7eb6cab0025c52fbc4dd42130853d25 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -17,19 +17,22 @@ package com.android.settings.accounts; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.accounts.Account; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.os.Bundle; import android.os.UserHandle; +import android.widget.TextView; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; -import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 1cc0c3a6643f918720c95b0ea1cc4e90b35173fe..5e252152974ab866d10d19ca8dd00f82fae581e4 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -37,11 +38,12 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.AccessiblePreferenceCategory; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index 4e317d7d8cc1c441079c31149541b23375a06eb7..672baaab576b4f3bdb7dc3194bfdcb2ffc267241 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -27,6 +28,7 @@ import android.content.Context; import android.content.Intent; import android.content.SyncAdapterType; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.settings.R; @@ -42,7 +44,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 4e42bc90154dea8c739a258a57b6598a446eb480..330ef42a7932f02c8e72734698b67335aa0d9a68 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -29,8 +29,9 @@ import android.accounts.AuthenticatorDescription; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; + import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 5db22652de2fccf04314fd28e5525af61027080b..623a76efff217e2cf726891368baad714fea2d41 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -29,6 +30,7 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.content.pm.UserInfo; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java index ce1dcb2712bec1ea44237dd74a3768141ac07913..0803d78d0f25f9258e09323c091577046c760435 100644 --- a/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.accounts; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 56659efb51c34f78dcfe6de50fc6e318b62bf159..ff4e7a49acd49a2466bf1497c750f927aa279517 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -38,10 +38,11 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; +import android.widget.Button; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.widget.Button; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java index 97210b332b49ed97b406c60f96821d0441991cfc..faa1bde3ab6550b3efb0e1cecc4d4bfcd2ad5bfa 100644 --- a/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppAndNotificationDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 605b8de1558ea6f533aee6d49ed75995e8370878..0c7da76fc40aa3d73c05fd9c4891e92d16f15c96 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -31,6 +32,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.net.Uri; import android.os.UserHandle; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index 581b30015fda015c8691e89ba29501488c984923..545cb58a24305e4dfde32c5722a9280c3114225c 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -31,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index fa426291bc87a6366cb8e12e052ae40a27cd8662..04a1237150ae99087e0125b7a5640c6ad0aff7e8 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -1,10 +1,12 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java index dcc6a1e912e3848a70bd28de9e10a0cbf79c485e..27094e8b1765e175a4ece53bf3ffef8cd4fe4b01 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java index 8365db2ec4564e70b81de3238387b33476e57df0..780a715925dab4e49d41dca6c94c5d921b95ac62 100644 --- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java index cd41c8612aaae2dd8bad1b81d4c5bd2e26dfc9fa..082bbad08f29b5695b93b0fe68a2125df9a58d8b 100644 --- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java index 22140bb5c4dc36a94b5ef983ad704fed0da34386..c2089188db48be5ed252c292266ac7f7013c41ef 100644 --- a/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/DataSaverControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java index d17fc87156a5466899b148d38b7619e89d649926..402d18d8e8459079813564e0d1320143262845bf 100644 --- a/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/DefaultAppSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java index ad7e615ce786bc73e928d46cbcac52a4ec819c34..808cf4d5ee8e2eb0654ca25c971f78e2e8d88e39 100644 --- a/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/DeviceAdministratorsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java index b36472031f7b904ed56aca2e750b02f3f129eb9f..0aecf8b9c6b48c85ba5721f8d1a89dea17abd849 100644 --- a/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/EnabledVrListenersControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java index 4fa30eb921995f4b75c20670bccc48400d103597..3378492d27d4315e3c081fe088ba0083e3436c94 100644 --- a/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/FetchPackageStorageAsyncLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java index 6dfaa7c59eb589249aac28fd1fb564bead0c18aa..1bb444f47a7445559cdd367aea97a641d55f4b80 100644 --- a/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/HighPowerAppsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java index d97194852fc50d33cb43218745f3fc7bad3639c7..1e8ab77b8a7e0665626abe18424ec627ba73229e 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java index 119d3ebcffb2bdd05d47ce799fa3dd4f7fffb392..1fefc2d7229c112167d2c92a5acbcdc77c1ef34d 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.argThat; diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index ff64a8441619f21bd7950565367bcd705ab7c631..da65165c1e91f5fd717e89cd086eced8cd3400e8 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -17,13 +17,15 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; +import android.view.LayoutInflater; + import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceViewHolder; -import android.view.LayoutInflater; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java index cad4100adeaf91c5f198b434819be0e73e0f846f..e0cbed08b70d818bbad066f6d9e20b21538398ab 100644 --- a/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/PremiumSmsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 2876b62f7dc69da9159365232b5fb14363ef2d0f..e3e45fb4dca20e87cf948cf4ca5c8db83246c9d0 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -41,10 +42,11 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java index fd71af7ac1bdeeba7cc7953c0136848c34f98bf0..035ae3ce92c57fece3b846de2edfe902c1ee284f 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAccessSettingsTest.java @@ -16,6 +16,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index bd8b36e470ba72c55a29fb0a33b9f8842094a6e0..06cc2e3091540cdbf9d8d1795a92a6a2f58e4ad8 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java index 79ada895aecc5f7b07debdc7ad3f561c2fa5f6e3..f9cb01b988160c7f5eb5ea76fff3003ac5b63d9f 100644 --- a/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/UsageAccessDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java index cf423f7a635b5086a16f37a503c71e322cf76984..b119f1da77e2baea7eab5b6de65273bddc0382e9 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppActionButtonPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -40,6 +41,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java index e1e115446ae1d7dcd5c31a9f870126d5333b421b..fc523b9c3c61316166300d40b051ebeea8231df7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyDouble; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -32,6 +33,7 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.os.BatteryStats; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java index bab73b55a2ad47f24cffb6d042178311493a2177..210ee742c4b476aca23c7364273d092976dad97e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -33,6 +34,7 @@ import android.content.pm.ApplicationInfo; import android.net.ConnectivityManager; import android.net.INetworkStatsSession; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index 1c8569d1c2f8fd05544a14c5a1d97bd5d65d1848..b7bc79a9a4f13d2e4a8c2a44f44fa044591039fd 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -28,16 +30,17 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.graphics.drawable.Drawable; -import androidx.preference.PreferenceScreen; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 909d574ee48a80110c418346aec1223a8a2e4811..ce8ef15f9ccc1b787f69aecc5d3234dfc90e70a8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -20,7 +20,9 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment import static com.android.settings.applications.appinfo.AppInfoDashboardFragment .UNINSTALL_ALL_USERS_MENU; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.UNINSTALL_UPDATES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java index 1616c83767af95c74642eefa555410ccc6e10a3e..e68f8d39955da29caa69bb6c00c25d3b95daf60d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static com.android.settings.applications.appinfo.AppInfoDashboardFragment.SUB_INFO_FRAGMENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java index b640f9f5ce5add1bc16d013151ea61e06f42bda0..30152a4077597f51581a106f655178f43f23fa37 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.any; @@ -35,6 +36,7 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index 1c0d89705dab1a6d3fcf81954234f9095153a5fc..3ec6ebbf5b21db47533eee5aff9fb3fd530ea286 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java index 9678ecb3874538f61f709c5f9f45acc5cfff0918..2547c2717497d2010c76aa2008a748a673236e5e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -28,6 +30,7 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java index c18e5213bd568f19f9c08fb95cc49568b1244a5d..b3d0a0dbaf96c93c30a94320bf5b00ccb470e6e3 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java index 505f25ea2e07ac14757a611732ea24f2faffd987..aff29181eb6356a9c6b6b98b4273124f1b153fe8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java index b554a4de0f5dafb9f209af400da9722f4645cda8..2a1cc4dd7bdc9e1d40788caa2f8e8b8d6856fa67 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppSettingPreferenceControllerTest.java @@ -17,17 +17,14 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; + import static org.robolectric.Shadows.shadowOf; import android.app.Application; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ResolveInfo; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java index 76c33cb57cb8d2179f73e0242f36f7acb4d45c72..d3d7cdc2f5d6e0ffd3344260183d75e65df03d85 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -28,6 +29,7 @@ import android.app.LoaderManager; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.applications.AppStorageSettings; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java index f577d1ca1ebcfb15ed769599e52e7d79e52718de..e07f66e976247918cdb39164f866aa7d388ec17b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java index ae61a51549ec5748695a711dd75a08da866e0d98..f41ccf8960312b39021f24c9d937ed41e763139a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java index 34a9e2e2fa88be08c8719d4812b61e0ab33ff3b7..f6abb5bc1972a60effdf6de288e2f9b02d24cde0 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultBrowserShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java index 999e802b10d911fd29d2391bb2bee6d1b1e85177..e630a4c5d370caff479f3df381400a6284fd4acd 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java index 5536cff17fe97b08a972daf33009b0d33f04741c..a0b802e80f1252afdacc08dc902d8aa3ef40ca30 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultHomeShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java index cd6a3aef62580eb1c7c94ae80e3b795b25cbf2ba..ac79a4fba6ab0cb81bd49c5209f99152ea24393b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultPhoneShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java index 35f3d61809829dee655b5e2aa9cb95559eff64ed..3b9ce3d450b69c6231befc4d3a208a5ae46a91c2 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java index c8f19db21de79ee9d40294f3753295cc46f219dd..3cc4cfe6caacbef12db054e4114cc33dd842b637 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java index 6f134ae53a10c4c0a71759a15ad4b7eae1d0efed..4e5ed28fed75de54cc988ddf2b9e61e9b1af7cc7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS; + import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.nullable; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java index ef909070240974871a722aaff0cfcc0025de1a8b..a81035f17cc06c61d89f18509e13929723fcfc29 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java index 4f8961570a65d70837baab8d22898897090d0eba..d636fa468ef0dbf76b41adb464940895c19fe740 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java index 7c99fd0a609a9c16cd40d93ccd566ec80184a788..b256ec0be9f5fc57cf747cafb214c0061e82fadf 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.argThat; @@ -36,14 +37,15 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java index 7e1584842e36028c52bd9273a141de14a2239d36..af38db390380be38f3231de6ad7c376c69235a08 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java index b5b600a18078d03129cbf475947f7435cbba85c6..557be39ae16be9acc211546179f12ac20468b85c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java index b804b228ea85f872d52c253293a9aa1077e9fb74..8d705d07209e9866cec45cb048a6ce7d766ce9b2 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java index 87dedade8437dcfcbcdf3e6435bbdae716ea70bb..feb6157a8fb478f98eae8c2e20dd3c5bd032e5d2 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 9cdd2eaaa1c1188ccda468b9bd0ff93464d18f2f..358bd302b4d57e67fe54175e741d1b534c5d5557 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.appinfo; import static android.content.Intent.EXTRA_PACKAGE_NAME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -25,6 +27,7 @@ import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java index e702cd46143d48472ee24b438a42d39644dbf05a..00ecece335552ac7fdb8c1d14773ec3e73ff0109 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.applications.appinfo; import static android.Manifest.permission.SYSTEM_ALERT_WINDOW; import static android.Manifest.permission.WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index e83fbf861fe5cf2a86bd7d6999f4c077e4c59dec..74a38511c9b8e76286a199b101637a8959db4882 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -17,17 +17,20 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index dd4422a7f2e5ad45436f5a4000f4252255a6963f..10197aed4c8182a8cbfbbf0d4b1bd8b7ef79b5c1 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.applications.assist; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -26,11 +28,12 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java index 0ccba4d6ad2781ab5f36ddd888569e3ca5413306..b140faec43f8dad9f34a38b37a04a2dab1e1cc0e 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java index 320471c1b4f95b58ff445536ff240e27dc02b889..02c1b8b439278081b4d7ca1da0537381609aaad0 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/DefaultAssistPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.assist; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index 93d594209123fe9209351d7392eeb833dc92e14b..2ea6b283bbde7e07e54348d223f7d6cd47d44c0c 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -26,9 +26,10 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceScreen; import android.util.Pair; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java index 97e38a03c4c3d2b81eb56651938d6c0388e41b6e..b9a131643e95ec26578443d780864fac2a075899 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -18,12 +18,14 @@ package com.android.settings.applications.defaultapps; import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java index 35ce6ca9c832b44a2710ac684a990b6a9c78f6ec..067562340635dd4ef1eb1af20c6cb43cf9815808 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java index c7156d00e63e892ea819c272115d99b87057b9ff..cc64cbd76074744fefeaa02c77410f4e3d28553c 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,9 +26,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; import android.view.autofill.AutofillManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java index 15a1a67fe59704515972ca8991844e2f97935c79..cea8213a54fcea894d81e5c5480163834d2dba0f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -37,8 +38,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.wrapper.PackageManagerWrapper; -import java.util.ArrayList; -import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,6 +46,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultBrowserPickerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java index fa2a62c5c59b4c0c58e1c224b6d83678255c5428..f9ee145a049fa3571f674005a4ded4e07a4be334 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -27,6 +28,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java index 3fe7dc1891bb7192d5b6be2dedaa32e37329466a..47c9ee5b45835f501d3b772189ad31f31525e8fb 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java index 9e85e0e3e9e4e07fd88dc6380551c7091625ab8d..d50df2145c54de3ba96562794227807155dec321 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index 34869b6d3b3fdccc1861384a9b6a42107c11fde6..af1130f0c35f522f0d3615de1f6cc02416b39fae 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyList; @@ -31,9 +32,9 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,9 +50,6 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; -import java.util.Arrays; -import java.util.Collections; - @RunWith(SettingsRobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java index 454a5644781bf6ed29692cf5a7ca534956604609..1d4b5c0485d7adb456e9a6d004c7f519535e0c12 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.defaultapps; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.nfc.NfcAdapter; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.nfc.PaymentBackend; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java index 9b088cf39326fa00e0c1cee519f6283570f9ec96..13789302765c1b003beadcc40297165529e0e235 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterItemTest.java @@ -16,8 +16,11 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ENABLED; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ENABLED; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_USAGE_ACCESS; + import static com.google.common.truth.Truth.assertThat; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java index 4c94e0a03c5aa70080e03ae40650404ae7fe4417..7409136251bd2b35a157b9f374ce72c7b21f30f1 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java @@ -16,26 +16,43 @@ package com.android.settings.applications.manageapplications; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST; - +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_INSTALL_SOURCES; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_POWER_WHITELIST; import static com.android.settings.applications.manageapplications.AppFilterRegistry .FILTER_APPS_RECENT; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_WITH_OVERLAY; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_WRITE_SETTINGS; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_GAMES; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_HIGH_POWER; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MAIN; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MANAGE_SOURCES; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MOVIES; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_NOTIFICATION; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_OVERLAY; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_PHOTOGRAPHY; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_STORAGE; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_USAGE_ACCESS; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_WRITE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java index 5b0b275e16bc201045ecce5404bb1e90c8b03bf5..2ae956185727233e5c0ddc2cd82654bad35b092e 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ApplicationViewHolderTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index d4e8a0cacedba8d9c87c75bd5deac9b5a3040150..244daf9b2d41e19d76e8388cb2703fe60c01c6d3 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -18,12 +18,15 @@ package com.android.settings.applications.manageapplications; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING; import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; -import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN; -import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION; -import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; +import static com.android.settings.applications.manageapplications.AppFilterRegistry + .FILTER_APPS_ALL; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_MAIN; +import static com.android.settings.applications.manageapplications.ManageApplications + .LIST_TYPE_NOTIFICATION; + +import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Matchers.any; @@ -41,13 +44,14 @@ import android.content.Context; import android.os.Bundle; import android.os.Looper; import android.os.UserManager; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.LoadingViewController; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java index 776235c811cd637900207ead9eee20f63ade486f..09bbe508631c4b1ea4c25e87492a359ed2bccb83 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/MusicViewHolderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java index fc8f272f3d031d3f97f3fd3ceef71b2fc874cabe..6828668d221c0f2bdfda14ea5029ad67451cd94d 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/PhotosViewHolderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.applications.manageapplications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.nullable; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index ee05740c0caaef3dd1ce169a70b18b7f6320191f..1c290c484aa057ca929d461fdb9153990c8cdd68 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import android.app.backup.BackupManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java index cd0ba79222361cb658894b746c0506b51de632fd..50676c5624d2c0152f380bc80e3627d00f0a2a78 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.isA; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java index d156a2daee5afb8a0d39647ffd9e23e269e9c540..f3cb850ee59f3497d7cee5dcf7aecd00549508f1 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java @@ -17,6 +17,7 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 0a258bbe78b23f587790b77730300c4e3c81c239..fb3f947eba2a3bba91c7a8f42119663598b0d3ae 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java index d9261c2ec649260c550bfca4cf50bbcf9a08ade0..448a5c7212b295e701b698d218547740bee870a5 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AlwaysDiscoverableTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index ced8fc4a2e47155e07367bed4278a4dd3394ff57..d40e87f6b8ec6585ad46385007aad914624045ad 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java @@ -15,21 +15,27 @@ */ package com.android.settings.bluetooth; -import android.bluetooth.BluetoothProfile; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import org.junit.Before; import org.junit.Test; @@ -42,13 +48,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collection; -import static org.mockito.Matchers.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAudioManager.class}) public class AvailableMediaBluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java index 17d46a87fe4df89a1b0aef888f228200a0c5a160..c23d282ce3b1b506ed472d514a8b60a3399e1435 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsButtonsControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index 2f838081b0a4fdeb1c5d1ea858cd818c69902e34..764c2e96f6173f5bd1ffbd93d4ab9e8b07370ceb 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 0c2a381c59bc33f4e4ee91248d8e9a71afbe61e5..ca053f0443fc09309bf1995664831136a7575efb 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -19,12 +19,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 2567f534f66412a43b10f2dad14d1a5bd0d043d5..4d295e57ea157a5bb6796c4196a21e343b661fca 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.verify; @@ -31,7 +32,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; import com.android.settings.widget.EntityHeaderController; - import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java index 74499483ac0b76d7557e98197f4c0b2efe8e108e..d836a975a640efd8ccf4cdea13ceb841f8099af1 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -27,8 +28,9 @@ import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceCategory; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java index 4be27753f87b361da0a27e3836b3b9180d4815ff..8304059fccc5e27aedc502a9276bfff086882fd5 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index a15d26cc34de165985a2b082ab2e7ceb965734e8..8910418425b35fa0cb180883a097ef6e9f560173 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java index 1162f8e6ad94eab6defd0db96144ae8badcdde7a..55dd8ec24d9123a8a7cf6b30546f1db9a9731c8c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 3ce585ab83c8b341b2368a83f011ceb8e5d36bac..265819adac28791b74330e0481caf2d47dcbe3d9 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.app.FragmentTransaction; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index c1024c8c3c3ac7dd25b7b5b5a70d921dee14472e..0d053724c7913cadb8fcfa01fbb9f817f7bcc92b 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -23,21 +24,21 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothProfile; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.SettingsActivity; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settingslib.bluetooth.A2dpProfile; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.HeadsetProfile; -import com.android.settingslib.bluetooth.A2dpProfile; - import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index 4bb093c8035879491fa9d99e0aa59a102e5c1aba..da00456155484456fe9f5ad190614fc6a1e565e4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -32,11 +32,10 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.UserManager; -import androidx.preference.PreferenceViewHolder; import android.view.View; -import android.widget.Switch; -import com.android.settings.R; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SwitchBar; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index 7d2257af0c37a08bddb29f7dba2b1424454981ba..f9129757b5207a917b7389fb0a50e06f9c69aca0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -21,10 +21,11 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 3060734e491ab18f4b0ee3c9263a2391d3ffaba8..3cf880e3e06b92f1dab37f038633abcbb795b21f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -30,6 +31,7 @@ import static org.mockito.Mockito.verify; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.content.res.Resources; + import androidx.preference.PreferenceGroup; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java index 759c0cdb0022767e11164c4fa30c7d351287ad37..5fbd18f97fb9acaa0216254725e1e19a8727b6d4 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java @@ -16,6 +16,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 7a0a05d0cdbfbb3b8fa85acf66231e21d01f1abf..be86241fd4a549ccad3ed7ee4425a2ed6a6efba7 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index fe705aaeb40520e002ac2f19516dd77eb512c717..4c1cce1157048d3beb2910e81f0e485e9c32e35f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -24,6 +24,16 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; + +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,10 +43,6 @@ import com.android.settings.testutils.shadow.ShadowLocalBluetoothProfileManager; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.bluetooth.LocalBluetoothManager; -import android.content.Intent; -import android.content.res.Resources; -import androidx.core.graphics.drawable.IconCompat; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,13 +52,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowLocalBluetoothAdapter.class, ShadowLocalBluetoothProfileManager.class}) public class BluetoothSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java index 2ac1ed8fea2a6a33dd3de0ce7fbf806a150c5726..500d534f4ee7da25a365a3dec63d49c1461021f6 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index ccd57f5d66f589913cb73b9996c1319c075e849f..39d0f419b6e8a37346922a75343e081cd66a1341 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -18,9 +18,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java index 483df01a6b867dd066e4d7f932ba4f5554665a14..86203754fa691b4ec142ef5639d154bfc0b51a2a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -24,8 +24,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; @@ -34,10 +34,10 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAudioManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.HeadsetProfile; import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.LocalBluetoothProfileManager; -import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 12bcd74c07995222ac72868c69ee6baa4ad3d0ea..14dffe6182070e5ada61309922f396bb963f9db6 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.res.Resources; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java index 96f09e21bc68b00b9fd62f44f6d7ae3c2a1de5df..731b4d62c69b3498f3384f2d5da054e25637b427 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java @@ -17,12 +17,12 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.content.Context; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; @@ -43,7 +43,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; import org.robolectric.util.FragmentTestUtil; import org.robolectric.util.ReflectionHelpers; diff --git a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java index c9a93acf50e12cc4006daea5029c0d702d77ada6..5387b3412d13ba8313e8c4afe3447fd3e583912d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ForgetDeviceDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java index 5a8f2490e7a463ded71751effeb45f971250b30c..2af45bc3ebb3a00821b50b85dbb55d07cfd8966c 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/RemoteDeviceNameDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java index 547727beced719c9f930fc748641dde72eb5383d..a88d8ff446e63bd865cfc092ae690c2fb87c466a 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothProfile; import android.content.Context; import com.android.settings.connecteddevice.DevicePreferenceCallback; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java index c73313d63ff74db74b9871d3ab237ae6778fd9ac..4f02062cc630537fb2a31f81c48eb81440e7ac74 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -29,11 +29,10 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index ce5580242f22ad4bcf9ed00749becac7cd60b632..e3060e710a176a6e022fa94e7799b90111421cae 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -17,12 +17,19 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; +import static org.robolectric.Shadows.shadowOf; + import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import com.android.settings.R; import com.android.settings.nfc.NfcPreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -32,10 +39,6 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowNfcAdapter; import org.robolectric.util.ReflectionHelpers; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.spy; -import static org.robolectric.Shadows.shadowOf; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowNfcAdapter.class) public class AdvancedConnectedDeviceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java index 1b78f129d420d81bbef28d2d4f2b0420086bcf0e..a1e7f222dbf46d68252ab7470acb618b3e06dbb7 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; -; + import android.provider.SearchIndexableResource; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +34,8 @@ import org.robolectric.annotation.Config; import java.util.List; +; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothPan.class, ShadowUserManager.class, ShadowConnectivityManager.class}) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java index 6d0c9fbc6d6fac678ea45d1980c6071a1cd62554..8927670c356077a7a0d337f0d51a9d1e90267bfc 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -19,6 +19,7 @@ import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.media.AudioManager; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java index 44b7b8fb79eddd6da9cf37abc9e71df4c8e45b9b..e192f8969cff2932e4e5850987a0795b9051f403 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothDashboardFragmentTest.java @@ -31,7 +31,6 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import java.util.List; -import java.util.stream.Collectors; @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 52715b084df248eb7f2516c7b6a26e004a31783d..763e6050af873712f166f074b9e629fc4660fc18 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -26,9 +26,9 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index ba2a697a78170b33a490a5871a49b7946f51ccce..92574bb0aa311602e0f921391fa629fb1fe15104 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.connecteddevice; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,13 +27,14 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import android.text.TextUtils; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.bluetooth.AlwaysDiscoverable; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; +import com.android.settings.bluetooth.AlwaysDiscoverable; +import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothAdapter; import com.android.settings.testutils.shadow.ShadowBluetoothPan; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 36cb1801807da536af7245ae3b83a0abb8ce38dc..8a14c3f7dd39b9c4a17b406be31f0b5c5378e016 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -15,6 +15,15 @@ */ package com.android.settings.connecteddevice; +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.verify; + import android.content.Context; import android.content.pm.PackageManager; @@ -31,11 +40,6 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import static com.android.settings.core.BasePreferenceController.AVAILABLE; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.*; - @RunWith(SettingsRobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index b1d4cd81c27cdaf5403963502f9dba0e763b384a..e85626df5edea3650b0c8b3d8a817ce9a6701c07 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -17,15 +17,19 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import androidx.lifecycle.LifecycleOwner; + import android.content.Context; import android.content.pm.PackageManager; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java index 567b072fdda03f5fcfe74a10776f5847f663a0fc..9ad73bedb6e4cc7fcd04fc01bca9f47b28bfb335 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java index dca10d733904c3e3ed790722774ec88ae9d7baca..8aec1f7af8505358c30ded06136ceb930bf52d8b 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java index 716c9776f5caf827d14d3a2854a153221e38905d..1e24a99b1b255cd794e0be151b7253c84de89389 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -27,6 +27,7 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index 989a293fc1d1a0b9f63baab2d7b3a08cce6521ac..e25ea68c4727bd5d14464d3963183b91733d9ed0 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -26,6 +26,7 @@ import android.app.Activity; import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java index 7550b451630350399b2c2dff243fd4af5afefc22..1c6b750bbe6ca2acb42475de1ad83c972afb4f05 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -20,11 +20,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; -import androidx.preference.PreferenceFragment; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java index 2bc0ed965af9af4a3d469ab0b84efb745cb94a47..b3cecf83e24e9061d90aae8bf00e77e5a94c5e4c 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleControllerTest.java @@ -28,10 +28,11 @@ import android.content.Context; import android.hardware.usb.UsbManager; import android.hardware.usb.UsbPort; import android.os.Handler; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,7 +45,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsPowerRoleControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java index a1f9bf4e85d28b0a033d4c71c7d7c658d1417db2..867dd3eddf584d1c7a72d75f0594deb51c965c6c 100644 --- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -28,6 +29,9 @@ import static org.mockito.Mockito.when; import android.content.Context; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,10 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; - @RunWith(SettingsRobolectricTestRunner.class) public class BasePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index 16830668a06985be783bc53c6618ebefa523a3cd..7709fb3b0a527f1899e13756378161b1757bd558 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java index 8553f114d5b80925653379b3a8ee7a5c059343a7..3bcc2a2f3ff8c32186cc94ecdd3210d258e87aae 100644 --- a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java @@ -17,10 +17,10 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import com.android.settings.widget.SeekBarPreference; import com.android.settings.slices.SliceData; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.widget.SeekBarPreference; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java index c60d002237d0980eb0b115d065c02e944fee4671..c57c384ab1902b1fc4c1067894204e53cb6d4456 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.SeekBarPreference; import com.android.settings.slices.SliceData; diff --git a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java index 55a0acbec312bf27557e5a6eb81740f90024386b..326f45e03118418a1a05dfd35b7e0e682e3400b9 100644 --- a/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java +++ b/tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java @@ -17,6 +17,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index beaaa52a82e8c9cd2a6c7aa10beb6e7f95e9d208..53fe9a8b4543afacc465637612d03831b9a4a8c7 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.core; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.SwitchPreference; import com.android.settings.slices.SliceData; diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java index f0c2442d76219849f1adae44b6e62367203c0b1d..59082792e800c25dc1bc4f026f8fcbbab4df51b5 100644 --- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java +++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java @@ -16,6 +16,8 @@ package com.android.settings.core.instrumentation; +import static com.google.common.truth.Truth.assertWithMessage; + import android.app.Fragment; import android.util.ArraySet; @@ -26,8 +28,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static com.google.common.truth.Truth.assertWithMessage; - /** * {@link CodeInspector} that verifies all fragments implements Instrumentable. */ diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java index 1b2f72742d369c2d3370a5d712d89ef56620c210..030106ae2b793cb3162d826f2d4cdffc552ef4c1 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -33,13 +34,14 @@ import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.os.Bundle; import android.service.settings.suggestions.Suggestion; -import androidx.recyclerview.widget.RecyclerView; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; import android.view.WindowManager; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.dashboard.conditional.Condition; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java index 94126da5ff30c0bbfcbc0bc1d891f09046e01805..c0db3a0261a1eb2321a4cd52c5b69af84749eaa8 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java @@ -20,12 +20,15 @@ import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_C import static com.android.settings.dashboard.DashboardData.STABLE_ID_CONDITION_FOOTER; import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONDITION_DIVIDER; import static com.android.settings.dashboard.DashboardData.STABLE_ID_SUGGESTION_CONTAINER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.service.settings.suggestions.Suggestion; + import androidx.annotation.NonNull; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ListUpdateCallback; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 78d3a09adf52f967af8344ef58cfa6345e66b21b..92b44707c04afcbe5476b2f14a972ebce61f9e7b 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -39,6 +40,7 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 7638a07f573f3ffc0b5d496d79811e55c6444f06..708f21b2caab35cd6a2f11d99bf648ef65c16ff1 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -29,6 +30,7 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.Icon; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java index 7bcd80d6fc8de84a81c52202d43818a02f4b5d86..d3aa59b9874ee5aa2c0b59430664bb8dc12fec47 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java @@ -18,10 +18,11 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.TextView; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.Tile; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index 189dd6b8f375c381cfe94c94414917ef2041812b..b08c47bea606a8b45936ea624ce445c4acc45367 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; + import androidx.recyclerview.widget.LinearLayoutManager; import com.android.settings.dashboard.conditional.ConditionManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index e7014df7c6ac0316da6672d1fb6751aa37f3af35..d5636a16d5b7d97ac5a2f0f10c90a334b1676681 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java index 0c90660b114eb85854ef635470622d48233f619b..c83dd79e43f69336f39306332e7e5836904f9d24 100644 --- a/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/RoundedHomepageIconTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java index 0fac2fcbc566713e8394bae952c50e6b9a5a8dd9..d54ac3aca3b2bd5174051411c45fb9c8b54423ed 100644 --- a/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/SummaryLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java index c72131fa8e2592301e5a8547a3aca638afe31c53..c5c477940eba256fb5810f2bb031444fe9ac34fe 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/AbnormalRingerConditionBaseTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java index 9b5bec359add3ca7df6abb0fa7a96bf0bfe9a167..4a00a13ddeac9d8a54e9e46cbd4434705ca55da6 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BackgroundDataConditionTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java index 79f01f88dd0f66d3ca3ee70550cd4e8459b35718..91970c369b334c92d02d2c3b9e04881987231cb3 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java @@ -16,15 +16,17 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.R; import com.android.settings.dashboard.DashboardAdapter; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java index 6d5673151a2e8ba94e1db2f0f14b2cae0ab503da..434e008e40952c1c562bcefa21c8783410ad33b5 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java index 35940ce672032091ac8db18c178d841ef172faae..f5ec8bbd669c3f9203982fc6f70a364d73de0336 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/DndConditionTest.java @@ -15,6 +15,8 @@ */ package com.android.settings.dashboard.conditional; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -23,8 +25,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static com.google.common.truth.Truth.assertThat; - import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java index 66ef5a039b306a39f4492045ffa1d7eab8bca648..ceae3c20fbe9a67bdb28a15a49707dcadd67ebc1 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerMutedConditionTest.java @@ -18,6 +18,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java index a134fac572180e56d337b0d79264f5c4a0976f28..2bf1f98645bd385da4634157493650fdf1b3f2bb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/RingerVibrateConditionTest.java @@ -18,6 +18,7 @@ package com.android.settings.dashboard.conditional; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java index dc492a9390715ed3adf7b7caac043e0e54a46976..6f71ac8271575cca7f367e1b2ac732202b013ceb 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java @@ -16,6 +16,7 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index c62f63d20a97b25c98a10397033a1bcab42563d9..5a275227058edd986b57138a013ecb60af96893e 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.suggestions; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -26,17 +27,14 @@ import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; -import android.provider.Settings.Secure; import android.service.settings.suggestions.Suggestion; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; -import com.android.settings.Settings.NightDisplaySuggestionActivity; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -54,7 +52,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java index 5ff88bd42e6757665aa59a8d0b0a800cc9f69cc4..3a827960a32fdb14037c737fe1323724e7a8b6ac 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionStateProviderTest.java @@ -17,6 +17,7 @@ package com.android.settings.dashboard.suggestions; import static android.content.Intent.EXTRA_COMPONENT_NAME; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java index 5de54ea277428373771d4c4496dd1d7add48dd86..99a3629c05af5c9642fe9923a017c9f3f89a0353 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsagePreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.graphics.Color; diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 4f107e583c5c1657745ceda8286145018010827b..2d98879c3918ac3f8c92e55f5fbee0d9d7921c80 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -31,11 +31,12 @@ import static org.mockito.Mockito.when; import android.content.pm.PackageManager; import android.net.NetworkPolicyManager; import android.os.Bundle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.util.ArraySet; import android.view.View; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index 40c22c7444c6ddfcff9724943dded0bb077ee85e..e3034f88c213b2176b836b4096dd1cab76fc478d 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; @@ -26,9 +27,10 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.graphics.drawable.Drawable; -import androidx.preference.Preference; import android.util.ArraySet; +import androidx.preference.Preference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java index e4ed8bf9721114060d99162ef563f1d115474a40..96767a27a2582896508be77ed755d02c2264b260 100644 --- a/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/BillingCycleSettingsTest.java @@ -16,8 +16,10 @@ package com.android.settings.datausage; import static android.net.NetworkPolicy.CYCLE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Matchers.anyObject; @@ -31,10 +33,11 @@ import android.content.Context; import android.content.DialogInterface; import android.content.SharedPreferences; import android.os.Bundle; +import android.util.FeatureFlagUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.SwitchPreference; -import android.util.FeatureFlagUtils; import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index dd05b772ea57506caaca154aa230b006a3efdb51..744096622fd6417c7d0465b58983cc3bca8bffa5 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -16,17 +16,19 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java index 00d02a3d90b8b359cc0cb1078dc7d2071f705ded..b969c3a914f1aca13deb055c916611fcb9bc278a 100644 --- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,8 +26,10 @@ import android.content.Context; import android.net.NetworkStatsHistory; import android.net.NetworkStatsHistory.Entry; import android.util.SparseIntArray; + import com.android.settings.graph.UsageView; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java index 04b50305972dfcbd31246f40357787ae822e52c7..6fad6e52fa6d509c7a4aec3d8ba8795370f45efe 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageListTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java index 2216792836c05fd8c0ac3189fce29eca798efcfb..061c7952dbfe728ac9b05e915dc9e83527f4d867 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryLegacyTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -24,7 +25,6 @@ import android.content.Context; import android.net.ConnectivityManager; import android.text.format.Formatter; -import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index e471e6d7629e93c1ce5c73cf796206eee62532c7..d0a3e136d16d47b5c9f2dc9f3e668a134f33f92a 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.datausage; import static android.net.ConnectivityManager.TYPE_WIFI; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -32,11 +34,12 @@ import android.content.Context; import android.content.Intent; import android.net.ConnectivityManager; import android.net.NetworkTemplate; -import androidx.recyclerview.widget.RecyclerView; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.recyclerview.widget.RecyclerView; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index 573bc74d037b34d7b7d21537b6552a9cd8646f77..8c520b40ceb2d5f9c877a85eecdcac4aac500e92 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -17,8 +17,8 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -29,7 +29,6 @@ import android.content.Intent; import android.graphics.Typeface; import android.net.NetworkTemplate; import android.os.Bundle; -import androidx.preference.PreferenceViewHolder; import android.telephony.SubscriptionManager; import android.view.LayoutInflater; import android.view.View; @@ -38,6 +37,8 @@ import android.widget.LinearLayout; import android.widget.ProgressBar; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index 6f0ec9f55c1cf2ddd1c977b4c205e64a005b1d39..e619399a504ba829daaafd84646a498b2c242c2f 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java index a35c897df05216a55b46c1221075d92927ec7f15..0270be4b4cdefe3216b77109f6bc49e25c0f1ba4 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java index 01639d40c0ee593ce8812dffd32c844b8793b962..a8ad8aa083ef28130b684cfa14a7659ab55ae452 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessTest.java @@ -16,6 +16,7 @@ package com.android.settings.datausage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.nullable; @@ -30,6 +31,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.ApplicationInfo; import android.os.Process; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index 8a3f8d34624418388c024938e2850e0765dae735..f1795f3d0e63443433dccc1f6cf5b453a7f35a14 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -21,9 +21,10 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import androidx.preference.SwitchPreference; import android.text.format.DateFormat; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java index e725877eadf743489de552b1cf7be41fd364116a..4d1ba380a5e51850d70153a36643d9bb27d0c010 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index d0bacf7801e26c5931987ff37dc001ce9932a54e..11b2efdfc07d58aa53ac6b57b79519bbe01a25d1 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.robolectric.shadow.api.Shadow.extract; import android.content.Context; import android.net.ConnectivityManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java index 7fd5b46ac0a3c886c491295ad1a174b44baef813..0f5e0880b957510e12634d5df3ba04f63255ae79 100644 --- a/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/DatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java index 802d9edb120201af375563403fed8bb45a1c042c..ee495d361f628ba1366c03ccc988f8faed0c0431 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeChangeListenerMixinTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 58862ee2cb2730a410d66140863e1502ca8ebf6d..5180455fc49585d0dbd0a83cdb3af62c0250f4d6 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index c6f99a3c656058a419ad372768866e1eb9704eb2..d73c8db54f1efda5062377baa96daba5762b8f3a 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java index 38aace86e7be02b097a0c7026083de7dc2b2cd18..a8c09f26006c6001dbc24a1b4862c10939d5638a 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeZonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index de330855f13b2142455083e60e633a260e77d2f6..365bfa2a33c28540858f6ad0c896cc5dc89b3fb3 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,8 +31,6 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZoneAdapterTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java index aa0ba77d176de12f883c28983c33174d21bb6b9a..daa46a54ee191f5dea3721169d3ea7bbb6e15c3b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPickerTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static org.mockito.Mockito.mock; + import android.content.Context; import android.icu.util.TimeZone; @@ -35,8 +37,6 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import static org.mockito.Mockito.mock; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { BaseTimeZoneInfoPickerTest.ShadowDataFormat.class }) public class BaseTimeZoneInfoPickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java index 4b86c5031813136d5e14b63be575e2c56b020b5b..06d2b2bca7d01192eb688bbc6e577365c866a3b9 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -26,9 +29,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; - -import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index 9d650cc45afd627774e370af7140517d2dd33133..9f3453d542b749780c9ad1b00116163664c93e95 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java @@ -16,6 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + import android.content.Context; import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem; @@ -34,10 +39,6 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java index 53fe2b6f9e035ba6286678c023e85525ccc895a8..6802e8aa30a4c376dae8bcc02fa5aecc1424436c 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.icu.util.TimeZone; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -27,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index e07d8a687b6097bd2d48d76ba5a03b7bcb52aa87..f33311523dcd34453fcfd55dcbf2472e8c8ac817 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -16,7 +16,10 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -26,8 +29,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java index e5272704ecb5f08ed54de7e85347836203860aa5..220e677f9077d84ee0c05dd40eaa97593361b794 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.icu.text.Collator; import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator; @@ -31,8 +33,6 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePickerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java index fc4607938636cd75fc5185cce27bc7bbd8dce16f..3c98985c12ba8732913d50fa290c216435a69ab6 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.app.Activity; import android.icu.util.TimeZone; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -27,8 +30,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class RegionZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java index 55179070b58d6846c9084e062521b2380543f271..4793118b955b782e2be8db28bd7e4999ca0e4e5e 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/SpannableUtilTest.java @@ -16,6 +16,8 @@ package com.android.settings.datetime.timezone; +import static com.google.common.truth.Truth.assertThat; + import android.text.Spannable; import com.android.settings.R; @@ -25,8 +27,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import static com.google.common.truth.Truth.assertThat; - @RunWith(SettingsRobolectricTestRunner.class) public class SpannableUtilTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java index 725313e33f23c25d25e2e7721f8e387a5e7812e9..51d4a4b53a1fc93278eac3d7e6ccfd8939e56b23 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java index 0359cfcd7ae52d4c6c2c3bf80342dfb4300f0f92..d7fdd2ca4c587ee693b52da6357666a27e44d468 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java @@ -17,19 +17,20 @@ package com.android.settings.datetime.timezone.model; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import libcore.util.CountryTimeZones; import libcore.util.CountryTimeZones.TimeZoneMapping; import libcore.util.CountryZonesFinder; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index 9e72d9896aadcf43c863dc548a3f5f8a7649ba46..b6a93227262ddae3fe8d327f8b7c3822ae09cee2 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -6,6 +6,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 8a8c5a134f5eebfa5857654ccf1eabd356d482b1..a766aa8599e04de641f77154c2a81d5cc56969eb 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deletionhelper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -28,6 +29,7 @@ import android.app.FragmentManager; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 2c0676dd541b9b021e4a0c60459a497d5805f033..2ed09420765b07ec2531186d6939f5357f0eccf4 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController.STREAMING_LABEL_ID; +import static com.android.settings.development.AbstractBluetoothA2dpPreferenceController + .STREAMING_LABEL_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -25,10 +27,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index c91dea9c6e4d755305d5b0d6ef6311c88109677a..ef7e076e28522bee6bdc88fe29f26310356ee489 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,8 +26,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index 24acf7316ba5ffc0c0af2a59c72d162239f3c2df..2175f39a170a1a941231f797728e0484a2bd9f95 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.AllowAppsOnExternalPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.AllowAppsOnExternalPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.AllowAppsOnExternalPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index e793cbbc1a465e5c27a74033fe584dbd6bf7c521..accd05b8a109677c2a2dd3332f4d9ba480f08ac2 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -16,16 +16,20 @@ package com.android.settings.development; -import static com.android.settings.development.AnimatorDurationScalePreferenceController.ANIMATOR_DURATION_SCALE_SELECTOR; -import static com.android.settings.development.AnimatorDurationScalePreferenceController.DEFAULT_VALUE; +import static com.android.settings.development.AnimatorDurationScalePreferenceController + .ANIMATOR_DURATION_SCALE_SELECTOR; +import static com.android.settings.development.AnimatorDurationScalePreferenceController + .DEFAULT_VALUE; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.RemoteException; +import android.view.IWindowManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index 720c08193014f58409b8f6ab9b051a06589fee43..e1fc149a19e43bb4fcf7c7aa66a77ca30bf273fc 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.AppsNotRespondingPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.AppsNotRespondingPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.AppsNotRespondingPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 1e2e44eae514600ce1032089d2189ba0dd847dc5..6878c3241079cf4b448c25583402c153c87c95d9 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index bf6ed9483cd74b22a5e77316c6f0ff2809632414..69c8d2b506d7aa221c6c6af9bf74edea74146adf 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -16,16 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController.A2DP_OFFLOAD_DISABLED_PROPERTY; +import static com.android.settings.development.BluetoothA2dpHwOffloadPreferenceController + .A2DP_OFFLOAD_DISABLED_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 3da315a0b64dba94ef91a7427d756fe84c74a7d3..9cc74369beab65203af34e8987d62831a4d06f84 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController.BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; +import static com.android.settings.development.BluetoothAbsoluteVolumePreferenceController + .BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index 5c24bc76f77b43d6779c6097aac4b10161f3ec94..a4da1973db6805ad2c7c144ad8d89866f860a111 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index d1305971dadd5ba0037f49e0b5a0f071a337d62c..eb1737b2b64f8a316aa4e31225ac8448242e78e3 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 4f0815f367eb41b5e0e9994d775b2764fe7a8c2f..23eea32dc9cca2ca82f52b4c68f9dc599fb67d85 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index 168c61aa24db13a16864629beacb596e728ee4be..516c8b28af583cf40d22dde66013fd2791dde762 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index 3c62d2900f086ec780586365ffec3170de40fbff..cb9337f4820a5289af0e4af8fdf1558dcfa5bfd4 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 6da67ffc8e501cde9672aa7aca1bfc9da03d7eaf..2d0c70a938cf40a7a250691e64849f89af78cf9e 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -16,14 +16,18 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController.BLUETOOTH_AVRCP_VERSION_PROPERTY; +import static com.android.settings.development.BluetoothAvrcpVersionPreferenceController + .BLUETOOTH_AVRCP_VERSION_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 2bd3b09bfb7d7066facdf149a2099aaaea8cba06..0cab3ece6dfc0b3b4d5976dc6bf5e741ca650262 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -16,14 +16,18 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController.BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; +import static com.android.settings.development.BluetoothDeviceNoNamePreferenceController + .BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 76eb4ac57b4c39751181a8164ae92cd513d95d4f..030aaa2f8716f2f30f521a91d23a54131e4208de 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -16,14 +16,18 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; +import static com.android.settings.development + .BluetoothMaxConnectedAudioDevicesPreferenceController.MAX_CONNECTED_AUDIO_DEVICES_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.SystemProperties; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 98c0b8372cb35168b328545e3cb9f02ee19b7536..0d75bdb5be7a81f1757819363fcc8345bfefbcc8 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.BluetoothSnoopLogPreferenceController.BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; +import static com.android.settings.development.BluetoothSnoopLogPreferenceController + .BLUETOOTH_BTSNOOP_ENABLE_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index f2593fceeef3ac50cd96a5c9303615e70e0118b0..b4ee99cb3192a59d5b0fa1c0c00e286d69a6af79 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.development; -import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.BugReportInPowerPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.BugReportInPowerPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.BugReportInPowerPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,8 +31,9 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java index 77bd6b868ec81f3e4ce5186c8f0bbd56b02c63a1..39fd368593abf21a6837877f61c42b784ed173d3 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index b61f49ae2f817f960f87f98ea396e3edf8076ce8..d39a8c2b8fd3ff2a8dc180f1c0b316e7430d8282 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -17,15 +17,19 @@ package com.android.settings.development; import static com.android.settings.development.CameraLaserSensorPreferenceController.ENG_BUILD; -import static com.android.settings.development.CameraLaserSensorPreferenceController.USERDEBUG_BUILD; +import static com.android.settings.development.CameraLaserSensorPreferenceController + .USERDEBUG_BUILD; import static com.android.settings.development.CameraLaserSensorPreferenceController.USER_BUILD; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 6f7c22414bbfd4726a2e8258323f5a0899d8ab06..7dc9d34fb5ef26a3cd13569bba5038d72277a742 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.ClearAdbKeysPreferenceController.RO_ADB_SECURE_PROPERTY_KEY; +import static com.android.settings.development.ClearAdbKeysPreferenceController + .RO_ADB_SECURE_PROPERTY_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -29,8 +32,9 @@ import android.content.Context; import android.hardware.usb.IUsbManager; import android.os.RemoteException; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 67ba7c4ed33cb24878af6dc95cae9a50623a04e6..8d9549ab623eddd93c12be3fef695d007a0f0ff5 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.CoolColorTemperaturePreferenceController.COLOR_TEMPERATURE_PROPERTY; +import static com.android.settings.development.CoolColorTemperaturePreferenceController + .COLOR_TEMPERATURE_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java index 9ddfc4b45e0df09018e2b120ac1c2a551aefb450..3dd18d9dcee0ac91f4582eceb8b112a0e5f98fbe 100644 --- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index 52ca56e80bab2fe24738725a25cb7cc4fbfddeda..d2019280a65ceea96f01958ca5f261c1b187ac0d 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import android.view.ThreadedRenderer; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index fca76a4860cd73278e9d30ef646f40f1f9eddfd5..a3728602796fd0d693ac395af2dcee23c941abb6 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import android.view.ThreadedRenderer; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index cddee7f683cacef6e14bb91c516fa8ae21002dd5..e737077eb13b11c495f25ed2d13409d4db03cbc1 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index da32ce8190922a7db0e90da35a4f9226597fefc5..fffcd4c8f0f41112db8b51537aafc503c553295e 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index c2ad6c34615f24d0d7d937989400fb2c980e3f7e..a6d11e903d8c821f8ef3dec17c9fd3dde99e1be9 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -18,14 +18,16 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; -import android.app.Application; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.SwitchBar; diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 3e0d118df0a83cebbc07974e04753ff5f68240dc..8bc3ef68b177d03626ac7490101ea98215cb8319 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index ae9added789dfed6491aee15c5f899ecedda9c7e..c90d8fbbce987180fa2b11fd892f517e5791062b 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -17,11 +17,11 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,11 +29,12 @@ import android.content.Context; import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.content.pm.PackageManager; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.os.RemoteException; import android.view.DisplayCutout; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index c16f4538b080c23a340d3ac9ba1fc5de2d0b52f6..1319c979fce7cd6f882ccb3207cc94f411d1741b 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.EnableGnssRawMeasFullTrackingPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index f3b57306067219ddc804e0ab01efbd975bb4480d..21d14ca3fa233fee7a43bc9de444b18d83bc2296 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -16,16 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.EnableGpuDebugLayersPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.EnableGpuDebugLayersPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.EnableGpuDebugLayersPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index dd16a284be92d05066f76390243114c0a491e283..8bbb7e2f0fbd4343dc20370ee84095a79a3c40f9 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.FileEncryptionPreferenceController.FILE_ENCRYPTION_PROPERTY_KEY; +import static com.android.settings.development.FileEncryptionPreferenceController + .FILE_ENCRYPTION_PROPERTY_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; @@ -28,6 +31,7 @@ import android.content.Context; import android.os.RemoteException; import android.os.SystemProperties; import android.os.storage.IStorageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java index 03f874fb2c821ba804168741225b75033bf55f65..aeda03235f04764e1e6d2fabac78aefc78c7e6de 100644 --- a/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceGpuRenderingPreferenceControllerTest.java @@ -16,15 +16,19 @@ package com.android.settings.development; -import static com.android.settings.development.ForceGpuRenderingPreferenceController.HARDWARE_UI_PROPERTY; +import static com.android.settings.development.ForceGpuRenderingPreferenceController + .HARDWARE_UI_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index aceb714cf40cce943bc9d1ecf6e897caf2f66408..a238e7630e8045babd68a7de19f97ef6fe67e6a5 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index 7f97adc90c3f2bda68de575b9a03255bb1437600..b58f756169ab03622a38fcaf4b49472ec5bce050 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -16,10 +16,13 @@ package com.android.settings.development; -import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.FreeformWindowsPreferenceController + .SETTING_VALUE_OFF; import static com.android.settings.development.FreeformWindowsPreferenceController.SETTING_VALUE_ON; import static com.android.settings.development.FreeformWindowsPreferenceController.USER_BUILD_TYPE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,8 +30,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index abc1c91b273f942df0622e2d30ad22d19b1a86a9..d2e2d31ce56edf25b6907f614a554386a4435092 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index fcf6b898db9c77e9cffedfb510792c3158313000..9ab7cec4a1198a7e0f79341033248344238aa425 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index db7e54694fd7318e8122d043ea454253a05d643d..9a69acfb220c581347821d54cdecd539cea24244 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.HardwareOverlaysPreferenceController.SURFACE_FLINGER_READ_CODE; +import static com.android.settings.development.HardwareOverlaysPreferenceController + .SURFACE_FLINGER_READ_CODE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -30,8 +32,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 4c65431cad82de897f53875ba5a1a3b7631f2324..9a80bea96cc83dde722b0980129a92945074b7d8 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.HdcpCheckingPreferenceController.HDCP_CHECKING_PROPERTY; +import static com.android.settings.development.HdcpCheckingPreferenceController + .HDCP_CHECKING_PROPERTY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 3a1cc1976a45cd6f8c767e2c73ed1443c2ed99be..a71f9b0848a3aae38a19cb75b78ebf411eb3bbe1 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.android.settings.development.KeepActivitiesPreferenceController.SETTING_VALUE_OFF; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -26,8 +27,9 @@ import android.app.IActivityManager; import android.content.Context; import android.os.RemoteException; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index a86e18df3ed6ecb974d5734e78b0f3786a226ae8..b0af1d5676e7e8e760dc4fcba4501cdbf12dcfb0 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -11,6 +11,7 @@ import android.app.backup.IBackupManager; import android.content.Context; import android.os.RemoteException; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 5fd3b219add299a181f0fb1ba726b610cb81dbfd..0fb88aaa84be20ac881723d0a7951b6ffe678542 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.LocalTerminalPreferenceController.TERMINAL_APP_PACKAGE; +import static com.android.settings.development.LocalTerminalPreferenceController + .TERMINAL_APP_PACKAGE; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -26,8 +28,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.wrapper.PackageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index d65e830e92fdaf587baf8d15f1841e71b35b1559..afbd806bb402d26995bf8c19e11640e904fa5176 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -20,9 +20,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.SystemProperties; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index f552a1706434f49e8caa44a192336fd3ce4a18b4..aee0ba8190057e264d3a14473b36d06c07a3d2e2 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index ad3345536a2d8b65f7dc329ea8dbb2f3163f428d..7424753a66ff411a61075e02daf5c2870c4c6f6a 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java index d3763ae9e7bec009717ff5af7424539381334835..abdd87cd029e449c3aab1cad0ba48ae5b00baecd 100644 --- a/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java @@ -1,7 +1,10 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_MOCK_LOCATION_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_MOCK_LOCATION_APP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -16,6 +19,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index e6a2d5ce3518a89e3491a46fb8be2f9e3f1b6032..965f756d6b9422ebc23c1a182025a3ab4bc519b1 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,8 +25,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index ce57fb51ddbd85369f469687bd1f99fc30ee167c..98f792bcc3ccf8d41f97a28036ec85bb486f688d 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_ENABLE_OEM_UNLOCK; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_CODE_ENABLE_OEM_UNLOCK; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -31,9 +34,10 @@ import android.content.Context; import android.content.res.Resources; import android.os.UserManager; import android.service.oemlock.OemLockManager; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 28f369fec86bbf831a12d118570769e64ea9f6a5..8140c324de0dda719fb771f85a7dbb1b9846ad3d 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -18,15 +18,18 @@ package com.android.settings.development; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.res.Resources; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 430e0ddcb19cc9bb61ded0d6297ffcfa899d1c6f..768ccec1c6a96b7cb297fb495471a7fdc89fe8c8 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 350122650b3a2352e38b7c715be2b40d093bb71b..1708068d359a992dec88eea8ebbe91ac39e36242 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; +import android.view.ThreadedRenderer; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.ThreadedRenderer; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 8785cf6a5ec23ee2a5ecf9acae70e0a09d989f6a..046636b9f3219a5ac258c5d8d0e17ded35d9d534 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; */ import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java index 8e59b84e5c78edadbe961cf23dced00c8a844bdc..f79cbe0bf514fb2a1cf5d45e8b61001692522f50 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,8 +25,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index 78387e39e711472bbd099edf428ed722ffb41f48..6b083da5d798c45fd1bd899c632a0023cf9a97f2 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index d4cb4e03b1539e232c361d36e0a83528ed5e62d5..7955db70b2c4c6ad9b88cea48819fcf5d8765f42 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_CODE_DEBUG_APP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -28,6 +31,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 46c214740de6724566d601bd68a45538ded788f9..04b0b3f1ab629db085f3df381ab68f3145c6c876 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.IShortcutService; import android.os.RemoteException; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index d373f1c09ada5c7425201e88f9f5b17b0b827a11..2acd44ad09201dce53c8c55ad0d337f62286237a 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -16,15 +16,20 @@ package com.android.settings.development; -import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.ShowFirstCrashDialogPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.ShowFirstCrashDialogPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.ShowFirstCrashDialogPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index c18857acce22b7403d4f0077c4231a91fc30269f..38ec01b80dea20452ff4d9ff2341fb793ba97ff3 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.View; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index 811550ff92e352572aab37cea848c8d9564a5cb0..e768e522d878da1a49e3e4e31d5f8a6bd15dbd19 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.development; -import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController.SURFACE_FLINGER_READ_CODE; +import static com.android.settings.development.ShowSurfaceUpdatesPreferenceController + .SURFACE_FLINGER_READ_CODE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.eq; @@ -30,8 +32,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.IBinder; import android.os.RemoteException; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index d7eaecdb68251550f02b20d0e3d4b6d675f51f54..b6d02caf11e9cce50845071dfc86ce220cf28e25 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index c136a29cb65ed95693d600bd5bac2009d032d805..633e8e4055de5ecfe1b5ca765330552cc17ab274 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.development; -import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.SimulateColorSpacePreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.SimulateColorSpacePreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.SimulateColorSpacePreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 40d439fe6d9f6995e9e225b862fbc7aea60d189f..05edd14ee49d28f2bdc73899093137858307bf82 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -26,6 +27,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index 1f0c9c553e56b2b2811490ebb8ade34306b341ad..3fceb1c79926e9aa472aa4567451872ddee0f12e 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -17,16 +17,18 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.os.RemoteException; import android.os.StrictMode; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.view.IWindowManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index 895722e6257656b936ab6f341e1bd478b664b475..e44aeb46cec927b4b10961cefaf3a9ebd9a726e5 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index e5c3e43abbc2f8e6f2ca0224926b26246be1f0ab..8bd43745a7503e1585c256718a5d9ed10dc30bd3 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -16,17 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.TransitionAnimationScalePreferenceController.DEFAULT_VALUE; -import static com.android.settings.development.TransitionAnimationScalePreferenceController.TRANSITION_ANIMATION_SCALE_SELECTOR; +import static com.android.settings.development.TransitionAnimationScalePreferenceController + .DEFAULT_VALUE; +import static com.android.settings.development.TransitionAnimationScalePreferenceController + .TRANSITION_ANIMATION_SCALE_SELECTOR; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; +import android.view.IWindowManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index ba27bfb0b2990f98fc3222cfe6c80a435f1e984b..0c82bb46574017aeb96dd625f937cad1a788bfe1 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index 98ff9e4944db713854ac5fb8e2603d3fd2ecf5cd..471fad9c749c1fbd3b141fa76974da6e0152fd43 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -16,11 +16,11 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +29,7 @@ import android.content.Intent; import android.content.pm.ResolveInfo; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index b152ea7c734b2913e01181d5fbe4fc4372f1b1e5..87d113504048314daead53aa7b4a5ab03e462474 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -16,10 +16,14 @@ package com.android.settings.development; -import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes.REQUEST_CODE_DEBUG_APP; -import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_OFF; +import static com.android.settings.development.DevelopmentOptionsActivityRequestCodes + .REQUEST_CODE_DEBUG_APP; +import static com.android.settings.development.WaitForDebuggerPreferenceController + .SETTING_VALUE_OFF; import static com.android.settings.development.WaitForDebuggerPreferenceController.SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -32,8 +36,9 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index e09b9d9a0d65b3541a10887cd6c85725a2338cd3..e749ea64b3a7cc5f6240ae6222b56ca3d9dab968 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -16,15 +16,20 @@ package com.android.settings.development; -import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_OFF; -import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController.SETTING_VALUE_ON; +import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController + .SETTING_VALUE_OFF; +import static com.android.settings.development.WifiConnectedMacRandomizationPreferenceController + .SETTING_VALUE_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index 528f3abc6c2d542b63470f3a313bf071def4fa1a..742bc7fe9aca1801d8c6fe6540f9dc2ae8517f11 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.development; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java index 1359e992fee6541d432d5ae74e24761e9d643192..daeff01ea633f8aad5e83a7bfa10d2b60bd3ce9d 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -21,8 +21,9 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiManager; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index e2db4f95d55f5260306010d5b60456672592781a..322eed789368673f848806b44a7abcbbbdc51949 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -16,17 +16,21 @@ package com.android.settings.development; -import static com.android.settings.development.WindowAnimationScalePreferenceController.DEFAULT_VALUE; -import static com.android.settings.development.WindowAnimationScalePreferenceController.WINDOW_ANIMATION_SCALE_SELECTOR; +import static com.android.settings.development.WindowAnimationScalePreferenceController + .DEFAULT_VALUE; +import static com.android.settings.development.WindowAnimationScalePreferenceController + .WINDOW_ANIMATION_SCALE_SELECTOR; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.os.RemoteException; +import android.view.IWindowManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; -import android.view.IWindowManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java index 5fff256035e6b23d926b1672fb70d263cc172aab..53e45043d5660e98d26ac20723e5292336906d24 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -17,14 +17,17 @@ package com.android.settings.development.featureflags; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java index 09027050ed7cb620bbe264dd60f84e2a04cde047..b34c6f0a754f12a630c2fc1340a281be48cd7af6 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.development.qstile; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,9 +31,10 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.service.quicksettings.TileService; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java index 7644749daf016146c54dd2c828e70493c170f806..636b067e17d32755f66146fe646a6ab1bcdd1513 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java @@ -20,7 +20,9 @@ import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeT .SURFACE_FLINGER_LAYER_TRACE_CONTROL_CODE; import static com.android.settings.development.qstile.DevelopmentTiles.WinscopeTrace .SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java index b1073ac79a943814f08923fbcf45555048f615c6..1560c51dd1eacad0eeb9254015be541da233c74f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BrandedAccountPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 0011b1534b7d9e4f50c899e09a8f65abe3a881eb..1411251c9e2a733e51ee5de5e5642cadd6dba00f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -27,15 +28,16 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.Fragment; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.Build; import android.os.Process; import android.os.UserManager; import android.provider.Settings; +import android.text.BidiFormatter; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.BidiFormatter; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.search.DatabaseIndexingManager; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java index 169554d7110535919a1e7293a40d304278b9c793..32a0f04294459826dc2edf7dd94f4deecfac64ff 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceInfoSettingsTest.java @@ -19,7 +19,9 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import static com.android.settings.deviceinfo.DeviceInfoSettings.NON_SIM_PREFERENCES_COUNT; import static com.android.settings.deviceinfo.DeviceInfoSettings.SIM_PREFERENCES_COUNT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -30,9 +32,10 @@ import android.app.Activity; import android.content.Context; import android.os.Build; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java index c91683e00d4ba98ee68e83572a6bfc64b1995c99..a3c6d0a680242daedd2d9e2c2140bc17083e265a 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceModelPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo; import static com.android.settings.deviceinfo.DeviceModelPreferenceController.getDeviceModel; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; @@ -24,6 +26,7 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 3e4b4e6fe2eb50db6ada7c897dd7b554e3c860e2..046bd844fb3332f26419c142a81ab2855158fed2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -29,6 +29,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.os.Build; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index e6b12d73e49dc2bfad6f11caef04e8e42c7350d9..2c2c2f28ff74cba119825c55abcd0c445bcf75e1 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -16,10 +16,12 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index f1e7f218631b5f36dfbc11b13fe116cf092204b0..b9bd46db455f5c397653a130d6969d8314c207cc 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -16,11 +16,13 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java index c269f712b44bac84b60df5089d2eb452dbd7eb7e..7b1de47555daff37b4179495c7e72e4bedcb1cc0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/ManualPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java index 9207e157201e214ca275cd6fb23b288be78c9920..ec04947db57847aeb074cdb7cf8ae6d3a508216f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -29,10 +30,11 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import android.util.ArrayMap; +import androidx.preference.PreferenceScreen; + import com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 565cdf0d866f9cae990d49b2d84139561ea67293..4748135a461c20972abf81ba973c1854db9cae44 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -25,11 +26,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java index 5f250dd0385f7bd4eaa7bbe320a6634e9c13921c..bad49f2ab604eecba74a967577ed4dddc77ebdab 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeOptionMenuControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index fea58e288109f9445ab12abc8dc119778c870578..24028d22ad876241b6de6620ff6aa638d3e6b632 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index fed2cbef516e1afcb6b2a92d9845922e9cb0fc3c..bd0eaf37fa0078fe120d705276fd024520388f82 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; @@ -27,10 +28,11 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.provider.SearchIndexableResource; -import androidx.recyclerview.widget.RecyclerView; import android.util.SparseArray; import android.view.View; +import androidx.recyclerview.widget.RecyclerView; + import com.android.settings.deviceinfo.storage.CachedStorageValuesHelper; import com.android.settings.deviceinfo.storage.StorageAsyncLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index 34ce2e626e12732f8d419bb608895aceffbf9d1f..d42b40ff7d6936232e9c771ec6067be550a412e2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -16,13 +16,15 @@ package com.android.settings.deviceinfo; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.widget.ProgressBar; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java index 440a6f586572706b4774a10ef13202e2daa57d4b..61fbf1f48d56911221d9257bc997606ea90c95b3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageProfileFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java index f50c725ac5a984b21bd4658d9b4525d3b8931f86..3e7ce7a93138059335670d7e6ac151a021184241 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_PROPERTY; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController.BASEBAND_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_PROPERTY; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.BasebandVersionDialogController + .BASEBAND_VERSION_VALUE_ID; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java index 2db2e6fb8f2dc315c575c2d9bf54afeec1d4f7a2..21388818eafadaf2e7b9644998c8fe40b70d6977 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController.BUILD_NUMBER_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.BuildNumberDialogController + .BUILD_NUMBER_VALUE_ID; + import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java index 6b4da5bd94944f00d73a9c20a02567990986c11a..7b07db486289d74de1855929e30022e9ad376e65 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController.FIRMWARE_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController + .FIRMWARE_VERSION_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.FirmwareVersionDialogController + .FIRMWARE_VERSION_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doNothing; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java index 05bbdb144522a9a58540ce322b9c3d1a0633b813..d519918f401220bd3d607e55f3763e7f40497ce7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.firmwareversion; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.Build; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java index f47c07e61b1e3c9a0f41d6469eb3708a9e0f6abb..24f4874dbe0b54b8f6799dfeb1d1f8c7907b4945 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController.KERNEL_VERSION_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.KernelVersionDialogController + .KERNEL_VERSION_VALUE_ID; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java index 6b26fc190a8192da07e54f44065a4572dfa57285..ba38d77e7e0b284ab81955f8a2d310d9896bc5d9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/firmwareversion/SecurityPatchLevelDialogControllerTest.java @@ -16,8 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_LABEL_ID; -import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController.SECURITY_PATCH_VALUE_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController + .SECURITY_PATCH_LABEL_ID; +import static com.android.settings.deviceinfo.firmwareversion.SecurityPatchLevelDialogController + .SECURITY_PATCH_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java index 658a60ad1b7f46ad8838f052073933541bceae58..c317d2fa373d997e76f35948d545c27cb86f0ca0 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -23,6 +23,7 @@ import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_I import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MEID_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_MIN_NUMBER_VALUE; import static com.android.settings.deviceinfo.imei.ImeiInfoDialogController.ID_PRL_VERSION_VALUE; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index c068ac76d5a1aad5fb4311ef511fc59906d4c27e..2788939a7404552ac600514b4c89f09dc9910fde 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.imei; import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import static android.telephony.TelephonyManager.PHONE_TYPE_GSM; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -29,9 +30,10 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index f612e55bb8a0ea3df715ee2e2f82644584e2fcfd..649b6e2049a6e896764219db91de5e79897115ed 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -45,6 +45,7 @@ import static com.android.settings.deviceinfo.simstatus.SimStatusDialogControlle .SIGNAL_STRENGTH_LABEL_ID; import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController .SIGNAL_STRENGTH_VALUE_ID; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -54,7 +55,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageInfo; import android.os.PersistableBundle; @@ -66,6 +66,8 @@ import android.telephony.SubscriptionInfo; import android.telephony.TelephonyManager; import android.telephony.euicc.EuiccManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index 8ccce3a2e02a6e0a361f1df0e871e74e461f1e1e..5fe0adb39c5e482dd9ac49653056acc55f653732 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -27,9 +27,10 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index dea0e4f881ddfad6ecbf403c0844f85b75e79c68..77d6f188b432c0910814fbe4a3aefbe544e45822 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.deviceinfo.storage; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -31,6 +32,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java index 9f5638847d2621ee27075c3e62a5673bdb0365fe..5da2cb8b09534262f11ac27f5622df9b4e3390d9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelperTest.java @@ -18,21 +18,28 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.CACHE_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_APP_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_AUDIO_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_IMAGE_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_TOTAL_BYTES; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.EXTERNAL_VIDEO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_AUDIO_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_IMAGE_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_TOTAL_BYTES; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .EXTERNAL_VIDEO_BYTES; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.FREE_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.GAME_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.MUSIC_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.OTHER_APPS_SIZE_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.PHOTO_APPS_SIZE_KEY; -import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.SHARED_PREFERENCES_NAME; +import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper + .SHARED_PREFERENCES_NAME; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TIMESTAMP_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.TOTAL_BYTES_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.USER_ID_KEY; import static com.android.settings.deviceinfo.storage.CachedStorageValuesHelper.VIDEO_APPS_SIZE_KEY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java index 1935c13a700c74e6ce9d06b437eefa4631ee08aa..d525501c777dddbc26352f2b4ad5bf017e50292c 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -27,10 +29,11 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; +import android.util.SparseArray; + import androidx.preference.Preference; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.StorageStatsSource; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index a4107f5b18645ffb299e9b06f942ebebe0cfcaaf..092d0055fe7c94985ab0b85292551118b30237ef 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -16,9 +16,12 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ID; -import static com.android.settings.applications.manageapplications.ManageApplications.EXTRA_WORK_ONLY; +import static com.android.settings.applications.manageapplications.ManageApplications + .EXTRA_WORK_ONLY; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -36,11 +39,12 @@ import android.content.Intent; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.storage.VolumeInfo; -import androidx.preference.PreferenceScreen; import android.util.SparseArray; import android.view.LayoutInflater; import android.widget.LinearLayout; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index c36af1b66d357a9e8a01c4e622d8f2a439a009e0..b51ae00549b54659eeac4c2d622723d65e837b8f 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.TestUtils.GIGABYTE; import static com.android.settings.TestUtils.KILOBYTE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; @@ -28,13 +30,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.storage.VolumeInfo; -import androidx.preference.PreferenceViewHolder; import android.text.format.Formatter; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; import android.widget.LinearLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java index 17ac6a98a052385456c8b5154a98fccb1d12cf6e..419aab50b1e56b2a4be80c4154dd9cd7d72badab 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.deviceinfo.storage; import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,9 +29,10 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; +import android.util.SparseArray; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.SparseArray; import com.android.settings.SettingsActivity; import com.android.settings.SubSettings; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java index 7a19fdefa50cd4c572276f840c94b65556d18af0..1e912ba2b292fff8e0be7b155d64205e5ff16a70 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java @@ -1,5 +1,7 @@ package com.android.settings.deviceinfo.storage; +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -10,8 +12,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageVolumeProvider; -import static com.google.common.truth.Truth.assertThat; - import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index 77390d34738318f75c6886f62aca6175b8039185..d3c8542fa10312e611b81c265620b98016f4d4dd 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_AMBIENT_DISPLAY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -29,6 +31,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java index 8d62d2fe5c55f6b1278e674ab5d4f88039dd6a93..def3d306f1c6aaa119b60ed143ecffa6fc880ef5 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.hardware.AmbientDisplayConfiguration; diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java index 4361b7c6f315a8e25bfe3318e029be3af2434ebe..202873d85ca26086dc95cd01550387e4a70a3e79 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplaySettingsTest.java @@ -18,7 +18,6 @@ package com.android.settings.display; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java index ac3435d4812dfa1edecbfc66de14dccedcd52bf6..05226c359de61a4d7d6e29f2eae293c97816deb0 100644 --- a/tests/robotests/src/com/android/settings/display/AppGridViewTest.java +++ b/tests/robotests/src/com/android/settings/display/AppGridViewTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java index 188cb92a6467ec9b8909a0ba6a5acadfc87e8c71..9b82f05f5521abc2e690400cc1354fed7e73b431 100644 --- a/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoBrightnessPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 5a31e3b4942dddc047036b73a92c94988b409f63..e4db3ee1ac5d8ffa99eb81263fdb899b1cd6fe67 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; @@ -26,6 +27,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.internal.view.RotationPolicy; diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java index 673abb0e93ae1dde664733edb4944e434d076d61..7814d3f9fde5c7c111a7c7c6c9f1c20b03bd64bc 100644 --- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static android.provider.Settings.System.SHOW_BATTERY_PERCENT; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index b758531fb4998ddb4de74ef9ccb9ab716cd9e9a1..4122b14b734cf76fe5ea35715b4dfe899362477e 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.display; import static android.content.Context.POWER_SERVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.reset; @@ -29,6 +31,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.PowerManager; import android.provider.Settings.System; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java index c7b65356c204456c6c320a8d495fe859446727b1..4be4eb8d680ce13a1010072de1f30c8680c8d72d 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.app.ColorDisplayController; diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 40007759b10b8edfa5be251c729fac0e3bac4994..e1f133d5154617cf9022e1ba67d41093f8a7d540 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; @@ -26,6 +27,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index a4b0e54362f3359f2d81add5108f22a860cfdb74..30dedb6a001b16fde5bcf87aa40961bdc96a7b77 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -21,14 +21,15 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings.Secure; +import android.view.View; + import androidx.preference.PreferenceScreen; -import android.view.View; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java index 20b038092097b5f85fb7ed91e61651e3abf4963c..945b50f9d5c537e5c6405cb6020a368ab1e77c06 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java @@ -18,9 +18,11 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; + import com.android.internal.app.ColorDisplayController; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java index ed6618b1a600d02a44573208d440c941b2b9b1ac..c49c174be42c7177e0aa0ffe99a0cd6ba6be1408 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceControllerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java index c41300079daf000d42c4f3172360d6e2078e3b01..a38c755a65ced931bb760be956a98477efec7a80 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceControllerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java index 8168c203a5a24997d771532995a5e8dbc36886ef..e43e7259ffc774c210379b32bd46c0e8a9fcdca2 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java @@ -18,6 +18,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java index 40101a4bd799e65c1439443248141e33b14e0b78..99dcb5a7d96d9673ac1e8d590c670f2416c2c4ee 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayIntensityPreferenceControllerTest.java @@ -18,8 +18,10 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings.Secure; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java index 7440f63d7407a5f56ed81fae67454c02c9d107cb..9c4c539c2d9ee1571ce8840e1d57cd40a1fa2d1b 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java @@ -5,6 +5,7 @@ import static com.google.common.truth.Truth.assertThat; import android.app.Application; import android.content.ComponentName; import android.provider.Settings.Secure; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.Settings.NightDisplaySuggestionActivity; @@ -15,8 +16,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { diff --git a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java index 6942fd84d6c4d219a8eba53e903768f2da3ebb0e..80d8987abeb9f7995dd8890d0c41eca1f126a015 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplaySettingsTest.java @@ -21,8 +21,8 @@ import android.provider.SearchIndexableResource; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.android.settingslib.drawer.CategoryKey; + import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java index fe6686390b29b9890de40557264824937b34cb53..a5b34498a906b62b508a0e87eaee9d9b7cde11ef 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java index ad50c2e18f335dfa0ea5ca78106defa983361f37..b25e8e6e96987eac2b512d74d9037b92229dc060 100644 --- a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java index 0a6957d170a4c0581bb7e05b6c4cc3181fcc881e..9d15ca06dfed02bb1863ca5147b0b276dd8aa575 100644 --- a/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ThemePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -32,12 +33,13 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; -import androidx.preference.ListPreference; +import androidx.preference.ListPreference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java index 8627d5f1f1e346faa505e7cab42548567479312c..f5c2e26b59157efc5ecb56912b24ac7a96d9b92f 100644 --- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java @@ -17,9 +17,12 @@ package com.android.settings.display; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; diff --git a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java index 963bb145b2ea74a76673e25b87bc9ad65908191d..b7fb5edc412b57bc010edb018dcb6ffa1c1e7d3f 100644 --- a/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java +++ b/tests/robotests/src/com/android/settings/display/VrDisplayPreferencePickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java index 89ca00aa9748ffa3e6177e7f8738ac9f43a0840e..8a24241d4f4b89edf6757bd5f972f986eae6512c 100644 --- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java index 103cb534c419952d543346daa126d7ba690f0bc5..a26997c135a3ff8168204fc254184831b3a58037 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java index 44199404d73ad90ea73f93f3c566de42a42d7b46..db57a1e7977e96e586b1415ef89a5a6edebe4f24 100644 --- a/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/CurrentDreamPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java index 07f4a9d10e9ad6c93146c93551a42c3465bc8cdd..b9703e2176ba14ca684b77777b2c4b2db016aafc 100644 --- a/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java +++ b/tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 8aea99004815a97370948916f709fe391ea53002..fc7edc2827c2d2696e56d130f886413eec64245e 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -17,14 +17,16 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceScreen; import android.view.View.OnClickListener; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java index cf7c659bd9c77d745899243a5824c1dfb265ecbe..17c6cedab2b5666c617dd59a7aebbabee64e5689 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPickerTest.java @@ -17,6 +17,7 @@ package com.android.settings.dream; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index d6e2e10b567b36302778a33a00d9114341b1a70f..e4f5cff1d76c05ca2477b011a158cf4aee3f69fe 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java index fa9702b9167047ea0e8db20892f1ebb8d079b206..1c47d914204457bc69fe3e6d48e1c052827e641d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -17,13 +17,15 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import android.text.format.DateUtils; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 287d33458d8c39196310c64287c8eb51a1bb948f..2da6a88df74ac768761dd356f49414ab8abbaa58 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -17,12 +17,14 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index b18bf1c6ad5aedd4250ddf01384f555757449351..8c704fca781140f68e7c88ee2b58572b3fcc0358 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index e1a992621ce7f0276126214336e2becd899fc526..759edb3708721c722edaceb4db099f1347e10fa6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 18797934baa03985c1ff5b2521511a250b4bedcc..5c197926a2744cac4610dde1df99fd3c813b3e65 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -17,12 +17,15 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.UserInfo; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index d2b305aa0bbcb4256fba5b2a42c419bbbca5eb45..833efd4d3dd55ba57d2bbbc36be07f510b065fa6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.enterprise; import static com.android.settings.testutils.ApplicationTestUtils.buildInfo; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -32,6 +34,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java index 72207d1b497769254c4b22c481f4a6ae9faf9130..4e6db05cb8722737c8c8df47878fa4f3ea5ad93a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java index a3eeb712c4d8d581beb3918362da9e014c8078f4..63c5981524bd8c01f3231408b1c371f590b2d941 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BugReportsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 2f31b28693a371d82a48ca6be420903aa3c5c890..48bb0ce125e118b5bd86f20961020d5c230c7577 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java index 485ed4685393b5a54c5aebbf50237d76248910a5..47db2c7aec052452b8aa413a249533095286729c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index d7d0abd09ae61285dc9d1a43b6cbe9452c036f5f..ac3ee27d8f2c43ebd8e09513fa23c316108809ba 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyObject; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java index fb65e5da4b472bd3b8d7baaea94165e38679df68..d65f95e5629cd6989fdf25c35815cb9a5059e0d5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index 845f607c308bb14a1c3384eca3d44a45134069a0..dc5794c85da36762841540f11a725a70bf467769 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index 7bbe9bc1c1249f67d37b7d8ae38ccd4c8c84c67c..d37738dfb156928cc5bdef9bb17aaab9cda4be2f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 6c5fed049105c16e82482b1ab8fb4b5b2d0e5cb4..54559688401c26d5fef0d36dd937494e5cfbea91 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -17,10 +17,12 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index b54dc9ae4ee09b490f3a0be30f3f441456e42a74..2b3ed738dd73e4b78ca18ce932beeec6d298fb85 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -32,6 +33,7 @@ import android.content.pm.PackageManager; import android.content.pm.UserInfo; import android.content.res.Resources; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 442b56caab9896801641be2feda951f9623222ad..eabd4bb7b6c5b6c2ea1cffeeb92b8ea5835874e1 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.argThat; @@ -28,6 +29,7 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.UserInfo; import android.os.UserHandle; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java index 0ee50cafe560c1d54f6af9e85d852c6d0bcff8b7..9dd02dea4132092750b87157f16ac0ad262ac934 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 14ae7b4277a22b73ebec338e62ef0d43329c3bb0..10e569a7a7e36abc8388310e2faecc9d36259b4c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index c007d37375e41d4ae62fd611e0f3e22563d36d82..d62576065f511587f6bbd63603c020852e0cc8b6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -17,9 +17,11 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java index 885e8901cff014604782ce8cc2fc3b4f407db549..421a99fa2316cc89224c776f6e9bce46eabb9cf2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java index 2201e69e4a400ab5c0bc13615403c6f7c8903453..56d90f56c76db6f9681c1e49f556c0016ca9e75c 100644 --- a/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/NetworkLogsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java index 2736d5610a6dc7fa41581c75721f04ee0564b851..00eb3f964876a75da4841fccff7c5333b557d361 100644 --- a/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/SecurityLogsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java index 8c8113be4cdcb61e2446204fb8ff07d89d6802d0..73318214b4061402053e3fabab80c1d5aa06a803 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollEnrollingTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java index e83e93d9bc947228ee06b9816e507f3d484d3f83..f054b57fcd3ac3b5cbe4595ed6154e0e153f2489 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollFindSensorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java index 74d4b28a1b739c93d27bc4a75ad99ee98318fbca..5b7336fe7b956666e6c17d340c5b4a0ebcdf40aa 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintEnrollSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java index 01a3c1e1769e6e83a528bde25e8054ac4b7b4cb3..f1e2adcde6dc1add06464e8031762d05f38c9e35 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java @@ -17,14 +17,16 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.FrameLayout; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.fingerprint.FingerprintSettings.FingerprintPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java index 583428e6c0f487cd95e834378596a3d34642da5a..bf91578c9c375c5ecd0edd9a011e3707fb1b2d69 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintProfileStatusPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.fingerprint; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java index 8e94be01b471de8a8b0ab6a804c074733fa584b7..0e689e9e10bbba76508bfed17aa21aa03b399f46 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.fingerprint; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -29,6 +31,7 @@ import android.content.pm.PackageManager; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java index ee47f2a036cc2fb245dfffc07bf0a2b10d71ac67..fdd47921a1b847faaab3bcc505757de31d96b5f5 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java index 9e62511d6b2f344ba18dfadb2327c1c48d1b5f82..a5de0533b54335acd8028e72751028ecaf785469 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/SetupFingerprintEnrollIntroductionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fingerprint; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.KeyguardManager; @@ -27,7 +28,8 @@ import android.view.View; import android.widget.Button; import com.android.settings.R; -import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest.ShadowStorageManagerWrapper; +import com.android.settings.fingerprint.SetupFingerprintEnrollIntroductionTest + .ShadowStorageManagerWrapper; import com.android.settings.password.SetupChooseLockGeneric.SetupChooseLockGenericFragment; import com.android.settings.password.SetupSkipDialog; import com.android.settings.password.StorageManagerWrapper; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index da4bddbb0a859d897779a5ccb3d2b73bdda1551e..2238821ac1adbbabea148847f4983fabd381d5ef 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -17,7 +17,9 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -41,6 +43,7 @@ import android.graphics.drawable.Drawable; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; + import androidx.preference.Preference; import androidx.recyclerview.widget.RecyclerView; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java index 551cb3e0bb085d2694d65642d30cc3cc98797872..4221a70a80bc4fc3327a1df7e8643fa683a87b13 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index e8e688d84dc9f4da1d184cf09be872b55412e4d4..0b6051b7ee1d17ff5e40c50fc845369bee7b0aaa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.doReturn; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java index d5f3e2b58a7a82298863d4f12e60e04956f7bd3d..f820e63e2177894ea25a262c4fd6682a5fdcc196 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doNothing; @@ -32,6 +33,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Build; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index a30ddf1cfb775e1e1b11bf45dcad967f380c279c..3e2ebaf49b95f31eb9d1d303c1f07d22d72363bc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -17,17 +17,19 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceGroup; import android.text.TextUtils; import android.text.format.DateUtils; import android.util.FeatureFlagUtils; import android.util.SparseArray; +import androidx.preference.PreferenceGroup; + import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsImpl; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 4583dd1b3b4787f57684526490fdd684e0a9f7be..fb34640a803a8d665fd5dcf66b4703c69a2a0dc8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.BatteryBroadcastReceiver.BatteryUpdateType; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java index 30999cbcd00b7a50b9713387741948955c72e15e..085e4368620a901c23a66b4c5189c27d2ca7c80b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryDatabaseManagerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java index b89a3f0fd0e718654f8a761851e09f048412c487..fceee7ef67adb4d11ec3bcbb366f2eefc36d3acd 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 8f94ffb64125a01d3df8bd81d73673052cd50932..2374206370803485a7990a3b572a9f133bc726ad 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.fuelgauge; import static androidx.lifecycle.Lifecycle.Event.ON_START; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; @@ -28,14 +30,15 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; +import android.widget.TextView; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; -import android.widget.TextView; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java index 0da118abc79c2af43399cec7706277a9307cda95..d0d3129a0f3b1b2dc76e20411e549985d2965626 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHistoryPreferenceTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; @@ -23,11 +24,12 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.graph.UsageView; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java index bebf31fabc74f8d6b8aef686c61e1474f70b5c01..dc5834ee9c0e3a55fc6e3e91eb7a20493b1ed888 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java index 99967f78370f786f078c9b3cd39dff356e0f07d9..821089d4d49c99d347539b74d8060e0b02d62b17 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.any; @@ -41,7 +42,6 @@ import com.android.settings.testutils.BatteryTestUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; -import com.android.settingslib.utils.PowerUtil; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java index bc91e17b204e6e6d0fc1032160a4f108dd40d61f..b8232d41ed23b2eaf13e87361eaa5cc112762a44 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryMeterViewTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index 66ea56c641b0430910cedff74a1fd2d06f788462..329a70dcd796c4917d394e4f5c9ae7644814a3e6 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -25,8 +26,9 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 5913d6b56f6e4b065b536f3bb9c5aa0901cacf5e..d22dd7b742267a74b73c3fadb21a9870cfd37312 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -25,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PowerManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index ac0b25a9646d633e47e5c44e67d76f6be738540e..43ea2262a4c9e2a302ca21b5a819cb633a609c67 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -20,7 +20,9 @@ import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND; import static android.os.BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP; import static android.os.BatteryStats.Uid.PROCESS_STATE_TOP_SLEEPING; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -54,7 +56,6 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.AnomalyInfo; -import com.android.settings.fuelgauge.batterytip.StatsManagerConfig; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java index 83d8f7a81f6cfb716128a367328fe3041096e821..77b6ed7ef23ff1bc85d1623e7d0399f81a42ffcc 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/ButtonActionDialogFragmentTest.java @@ -16,6 +16,7 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index caaf71e28f67bc961482da58b43ba36ed937b7df..140a426b7e84008bb3fd013a681cb3d58f0a1e43 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -20,12 +20,13 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.graphics.drawable.Drawable; import android.graphics.drawable.VectorDrawable; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index ffa49d4f2537be3f6de741016f6e68f698d1adcc..2f3cb7cf2a43c4455ede03e13fd8a09d146ada93 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -28,11 +28,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import androidx.preference.PreferenceScreen; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java index f003a7678c54c40dca4bfbaa3115925b49387645..960a7beab3314a71aee91fdfa2c70ecaa2a1caee 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java @@ -17,23 +17,26 @@ package com.android.settings.fuelgauge; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; +import android.util.IconDrawableFactory; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; -import android.util.IconDrawableFactory; import com.android.settings.SettingsActivity; import com.android.settings.fuelgauge.anomaly.Anomaly; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 07341a14656f8bdb66d669e16c8b3c0a3b3d5909..7d35ae3d9ae454499d68f6fef3073c73c4991d56 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -18,6 +18,7 @@ package com.android.settings.fuelgauge; import static com.android.settings.fuelgauge.PowerUsageSummary.MENU_ADVANCED_BATTERY; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyLong; @@ -48,7 +49,6 @@ import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.LayoutPreference; -import com.android.settings.dashboard.SummaryLoader; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java index c6f885cc5bf72571bd269309cde816c702dbdb1e..774ff071081d0d061fc22bef5759b941cc96048c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictAppPreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.content.Context; import android.content.Intent; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; -import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.AppInfo; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index c52377f172d2e6e1fbaa88d08bee9929e254fb31..07435182fd6e0772b40a59e2b2f7c8e60e72adc5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -30,12 +30,11 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; +import android.util.IconDrawableFactory; + import androidx.preference.CheckBoxPreference; -import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceManager; -import android.util.IconDrawableFactory; -import android.widget.CheckBox; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -49,7 +48,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 163b7c5c43d4d020a9c483856754ac527e091fe3..c70b23dfed54ec0c38a36dd0295b50f559cfcf9f 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.doReturn; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java index f209fd7ef71ae81687306380e2760ad436c9d05c..b2e4122b4e1a7d43cffa2c88cce486008cfac883 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicyTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java index 831b07cb3539c5a9e4b1c652533293b3b0166edd..92b765a07459aaaf0c520f9fd6f5d40c7c0a7b71 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java index e2febc11bc708a123bb7c7a9307a456bdf13cf68..41806127a60e9753b43ee0dddfc15b88303490cb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java index 873b512c66c627c284015ab418602485febef58d..14d53e4db59bcec988b404013dffc6280f973062 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java index 72abc18c490c6d16017b22088be5437f237c311d..6c11f0f679bc6d8ce3a9181954e6f33eb681e484 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalyUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import android.os.Build; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java index 20b5486db007edb6e9cc69bb1ad53dca2428ee40..9e1e2418d7a5a55e7435e1944023a3d8fa4e7852 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckActionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java index 49c679bb5477511490ae61c5a0e5a872fcbb9dbc..7516d56f16916958d8f203177d7185ff042d8bc3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/ForceStopActionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java index f49395bdbc25cfc95ac5e1f05f3e33119bbab1fc..8a6ce6285da93bf570e0d628e2204580f5a0ffc2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundActionTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.action; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java index 61cf694942d59d82cf4bf55030c082d5d44da414..16f7dc5498bf7f266f1f66103c08a43aa58099d7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java index b70dcaff0704dd08a333e5191b99bc94c14f7356..1e66b942d5dfb3e3760bd5da1aac0071b3cbcd3d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java index 789b80b4c06fc4253f0bc785c2bf7ef9a4bf3177..7792fbbbb460abc1d4394c37c0b961dee5b6a3e8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.anomaly.checker; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java index 89c5c0fa50924de43d25ee57243077573a00b3cf..2bc5b14dd3fe7d17bd4b17efffea10191d3ad779 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java index 9457f091dbef8048f7c70cdfbb92268061d36f03..4ff7a4f21a88568d5b595a714e55b4230f13d418 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -17,10 +17,11 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SeekBarPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java index 95c59904b3e160a596c7ce813ea0e2aa30f761cb..c09af2b817d256f74fdf42522cde376070d00d43 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settings.fuelgauge.batterysaver; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.os.PowerManager; -import androidx.preference.PreferenceScreen; import android.widget.Button; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.TwoStateButtonPreference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index 35b6531a5b3a1542a17ec378e3a9a4eba5529c00..8e7590bbb2ec67262b7246a2c8bb076bc3d09d2e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -34,7 +34,6 @@ import android.app.StatsManager; import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.Context; -import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java index b55bf6b956cbaa7a97864ec00fb9c5b230222921..ab3a1df8ebeb1da9ea5b6a3782666d794c81a489 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -52,14 +52,13 @@ import android.os.UserManager; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; -import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; -import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend; +import com.android.settingslib.fuelgauge.PowerWhitelistBackend; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java index 4623c1095557630be4657eff6db7c673eaef6aa2..4097e7cf6c4f97a176ad9558008c0cced4de57cd 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.when; import android.app.AppOpsManager; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java index b0d6a7dce491dcf6c209a1c34a780652c05f3e08..3a3291c7fb00299a50745874e3c0ae6b6b880a57 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java index ff52a0843ab873a27719bf057e83ba1743a4222e..2dea0faf38bfd8e2730f7203a9f280cbef7a8323 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,12 +28,13 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; +import android.text.format.DateUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceGroup; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java index 459c4e2a03fff97a601d01e2049104daa4f298e4..3882e8c0e85ad8ec72534728f49daed2c38d86a1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppActionTest.java index 836f458c752b216811519696cfcb9c125046b0ca..0d6f9c55ba62879c987812557d38d066ae7c9694 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 7fdf46a8f47057f2d14d3744bed737f5e76712a1..c44ae786bf36ab8c34a307948ce66feda76aa7c2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppActionTest.java @@ -15,8 +15,6 @@ */ package com.android.settings.fuelgauge.batterytip.actions; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; import android.app.AppOpsManager; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java index c4c3d021b185f52284f0eaee61701a8dfc21ad5e..24284efdd2207324c873f35543c2440cc19cc4b2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/EarlyWarningDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java index d00cf875fa3a4d20c2c22052551c5a18b0041a0e..379d28f1e6cc4cbf0d8fd90d57f235b39bd9b390 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetectorTest.java @@ -30,7 +30,6 @@ import android.text.format.DateUtils; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; -import com.android.settings.fuelgauge.BatteryInfo; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java index 42d882246284a59295e7fef0bb8943a94ffc5257..f10ea7ee601c1878017df42519fcf53849fdf3cb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SmartBatteryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java index df38d34d48b5d3e19b3d019f3f75835dda592ad9..27cb04b30721c90db8d2677f70d77c27982cb0c7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/SummaryDetectorTest.java @@ -17,6 +17,7 @@ package com.android.settings.fuelgauge.batterytip.detectors; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.text.format.DateUtils; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java index fa81300bcb6a64cb97c2f097f48325334dcee4b5..371bfb45796eaca8aa18ae07817319edb6464f83 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTipTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; + import androidx.annotation.IdRes; import androidx.preference.Preference; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java index 359d2601f81998ee46573eb10911f6a756e9f955..fe721133aea24a9ed1c2b40fae51c012dd19efb7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/LowBatteryTipTest.java @@ -23,7 +23,6 @@ import android.content.Context; import android.os.Parcel; import com.android.internal.logging.nano.MetricsProto; -import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java index e2c80df9a1f428ca1fc9abaaf39e310b43b837aa..825cfc0776982a90b1f20a8fd14c04a024e518f5 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java @@ -35,7 +35,6 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index bd96f0f4ba0b630d29bda5d9a792be79d161df4a..1c5fafcde34e18be40fa2d8975fcc104170fe034 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java index 9793f7d1576e390fb51a212fab54ff494efd2b5d..9946361baffa53aefa6e8223cbdf7b3dcefc1220 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 8c0be96d26bc67843d0d42fb028060fe15426131..0181d78b570e29e561b26ed89f721a383db22fc4 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -24,15 +24,12 @@ import static com.android.settings.gestures.DoubleTapPowerPreferenceController.i import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.when; - import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.provider.Settings; import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.display.AmbientDisplayAlwaysOnPreferenceController; import com.android.settings.search.InlinePayload; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java index efc9f4fe8fee2db97c430693aadfe06e7428f3fb..d373dc4803f08064414eb4d805cb7a10dbd3dc9d 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.DISABLED_DEPEND import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java index 0ec5ae1d5b132f9b262cdd32eeff7a490eb64b0a..0fce463007674ac9d81b6482ea7726410c98384c 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 493e643f49601de102f999d0d888bc211509ac83..7d1eab37864206b11d2ed6419a5693af7568749f 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -18,8 +18,6 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static junit.framework.Assert.assertEquals; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; @@ -28,6 +26,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java index 29d2c19e14967a6d1697e199623d0efa9542160f..db8064ae3ac533d40db2e542ef449a408dc4665d 100644 --- a/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GestureSettingsTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.drawer.CategoryKey; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java index adee6097fa1a87958a9f3cbf4934989903ae83f6..d8f800d520bb9fddcd70b21a4d0e7edcc7bad841 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index f609373aa79a24b195abf1d27d730ec863c8d8df..706f3ce59349161032ac9bb8b579d4b692668058 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.DISABLED_DEPEND import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java index 833a09d59b084d5e477b5fbcfb4559358f76b2ab..c2ed06f29cb83e52063633e8b93fa2df20ae602a 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java @@ -19,32 +19,22 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; -import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; import static com.google.common.truth.Truth.assertThat; import static junit.framework.Assert.assertEquals; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.content.ContentResolver; import android.content.Context; -import android.content.SharedPreferences; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.Preference; -import com.android.internal.hardware.AmbientDisplayConfiguration; import com.android.settings.R; -import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl; -import com.android.settings.search.InlinePayload; -import com.android.settings.search.InlineSwitchPayload; -import com.android.settings.search.ResultPayload; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -53,7 +43,6 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class PreventRingingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java index 8522229b8ebbea985e5ba1d12883fbf3057180d3..fefff22bff0767aa96fe386f32d18da4a6e8569e 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.SYSTEM_NAVIGATION_KEYS_ENABLED; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java index a001a4a36a967f0a26d641bab4a6b47306baf82e..b140b52411cfdbd1a1cb7aaa60e1ab1b3ae502a6 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeUpPreferenceControllerTest.java @@ -17,15 +17,11 @@ package com.android.settings.gestures; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import android.os.UserManager; -import android.provider.Settings; import com.android.internal.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,8 +31,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; diff --git a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java index 788d130d3d8507513b87f753396b0219423b4452..5ba64c32748f16882d6106d614df42572b27d6f0 100644 --- a/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java +++ b/tests/robotests/src/com/android/settings/graph/UsageGraphTest.java @@ -18,6 +18,7 @@ package com.android.settings.graph; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index e5ecd6d2423af2e73ad372a2c89476e2d562ce78..b672e58967fd3c18b9b14e925c726cdd391ab01e 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -19,7 +19,9 @@ package com.android.settings.inputmethod; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index ca23fa5e8ce9fe7a73d57f7fb00f50c18ccd1768..938171d53677a1c8c9271b0cdd94b3c67562d272 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -24,9 +25,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.hardware.input.InputManager; -import androidx.preference.Preference; import android.view.InputDevice; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowInputDevice; diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 11b3c4bdff023573442e0fd07f7414ff73769055..5a1a93b8858c589764f262709ed88f49e6e2ccc2 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -17,15 +17,17 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; -import androidx.preference.Preference; import android.view.textservice.SpellCheckerInfo; import android.view.textservice.TextServicesManager; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index c1a963cc6789d7be5c0867ed84161d101c3b7820..0c1e44e7cc30b03c661ebd953b9fa362336db8ef 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.inputmethod; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -28,11 +29,12 @@ import android.app.admin.DevicePolicyManager; import android.content.ComponentName; import android.content.Context; import android.content.pm.PackageManager; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 9e18e06d2203646edbe2e1b2d53fee21071d7f3b..954fd5c622ae415923031da3aa00f4ba9cc96069 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -27,7 +28,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.admin.DevicePolicyManager; -import androidx.lifecycle.LifecycleObserver; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -41,6 +41,8 @@ import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; import android.view.textservice.TextServicesManager; +import androidx.lifecycle.LifecycleObserver; + import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 8b7e8a6db27a5fa1ad4fc9ba85a7d031e8ea3d05..83b29fcdb62ed878667cb8819fd195456fca5582 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.AssetManager; + import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java index 9d42088a6dbd31fda764913aac965bb495c95db0..8101d404b420e2e2a773f48223073f40e178e49e 100644 --- a/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PointerSpeedControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index 1b07f404e5170a7a1fff2fa9300a9c8277c99c81..76b76f5944da8555a7a9308209d61a262dfe4dd2 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.speech.tts.TextToSpeech; import android.speech.tts.TtsEngines; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index c20a83e8c6b27edb57bfe707a119baeafdf3a8c7..9451092b0a3bff5ce91d8be91ffa31ed988053c9 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.language; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.inputmethod.UserDictionaryList; diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 0e5a9f6ad7112c83b2d324aaec4b015e319b787b..6903bcd0c9872e2f5a5af2b642fbcef3c44ab5ce 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -16,12 +16,14 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java b/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java index fb999582e495f5de76f9c7be16dd917432205846..504583773a2b6e84e3245ce1f46e3bccb56d47f2 100644 --- a/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java +++ b/tests/robotests/src/com/android/settings/location/InjectedSettingTest.java @@ -19,6 +19,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java index 10a313f65ef4d13d0562dece739f25c6677434c7..3302d2aae7b8bb9409a36d11989742987a8f1f64 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -16,7 +16,9 @@ package com.android.settings.location; import static android.Manifest.permission.WRITE_SECURE_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; @@ -30,7 +32,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.ActivityManager; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; @@ -40,6 +41,8 @@ import android.os.UserManager; import android.provider.Settings; import android.text.TextUtils; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 727e9a7e9bd8af76a600ac0940f238aad8c7310e..00d8adb2acd2b272f9711f61a4d4d8e12852068e 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doNothing; @@ -25,7 +26,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -37,6 +37,8 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.location.LocationManager; import android.os.Bundle; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 92fbeb9bf99c911668928b6a88995fb62f09bf4c..58874be9a3089d872cf168aa3fd8873f21c6b51d 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -24,12 +25,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index e96dd2fe96b3ab91894295ae757c062838ab6e74..66ea3be3f6b95e081ddba8b64ebbdbb0196c96fe 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -17,13 +17,14 @@ package com.android.settings.location; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -32,6 +33,8 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings; import android.provider.Settings.Secure; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index f3958f41d596325a5186f808235c48252ae7023a..9556b617ae48142a8f8e8c5170050a49024208d5 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -25,12 +26,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; @@ -40,9 +42,6 @@ import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.widget.RestrictedAppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; -import java.util.ArrayList; -import java.util.List; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,6 +51,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) @Config( shadows = { diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 5e8180edcedd3ef25ef2eeaf179cfcfe70de94ac..65b2e878d6adff5cd609c1d0e4f62ec9b485d95e 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -8,7 +8,14 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; + import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -21,13 +28,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class LocationSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index bd36cfaebcca429875ca6a98e450df6d2a3f47b5..475cb831544969387f022010d756eb14b7d2e1e3 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -22,10 +22,11 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 9a69ad76a10ec0f590580446c9114d71c2a85e05..3d3dd28aa61ebb051d204c576688266c795c1e40 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -16,7 +16,9 @@ package com.android.settings.location; import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.ArgumentMatchers.eq; @@ -27,14 +29,16 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.provider.Settings; +import android.text.TextUtils; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; + import com.android.settings.R; import com.android.settings.applications.appinfo.AppInfoDashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,8 +46,7 @@ import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; import com.android.settingslib.location.RecentLocationApps.Request; -import java.util.ArrayList; -import java.util.List; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -55,6 +58,9 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import java.util.ArrayList; +import java.util.List; + @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index 1614a6cc808ad23ab06aac51fe8a6be316d1abd0..a012c51c591f8a6753f8c00c35de675bdbe4639f 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -24,9 +24,10 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.provider.Settings.Secure; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index 6279adfc78308270e48a2383752c3d4136a484a3..fa0b64958a6d0acee217e95fec17cdf7288042ed 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -16,12 +16,14 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.provider.Settings; import android.provider.Settings.Global; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 2bdad8287a22df810e2d5f22fb0f742d8eb004c0..91a545c595d702d42c5c2dd01a89c725ae7228e1 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -17,24 +17,26 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.ContentResolver; import android.content.Context; import android.content.pm.PackageManager; import android.provider.Settings; import android.provider.SettingsSlicesContract; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index e81bd821c444b8332f796e52cf39a1e38f7c8085..09d1269f8013ec4cf5081ec94186af68c60f4204 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -32,15 +32,16 @@ import android.content.Context; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.SwitchPreference; -import androidx.preference.EditTextPreference; -import androidx.preference.ListPreference; import android.view.KeyEvent; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; + import com.android.settings.R; import com.android.settings.network.ApnEditor.ApnData; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 11eea6dc21da3bd1547119b2d55dd9fb4ecd9164..f27368e242beadebad75b711c3f4c23b84e412e4 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.network; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -25,17 +27,18 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.robolectric.shadow.api.Shadow.extract; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.os.UserManager; import android.provider.Settings; import android.provider.Settings.Global; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowConnectivityManager; import com.android.settings.testutils.shadow.ShadowUserManager; diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java index 06e334af8865afad8169ebc5670e09cf72b995a9..6ef798b87f7641a59074d38e27df9253484b36d9 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java @@ -16,7 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.nullable; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.SearchIndexableResource; -import android.view.Menu; import com.android.settings.R; import com.android.settings.dashboard.SummaryLoader; @@ -38,7 +37,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; import java.util.List; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java index 3a1833b2baf745de36625f7e22dfdb7a022914e5..8b0fe98568dc6c6effa04480d9279a849d32babe 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java index 92994e01ee34abf41611aa5cd7ca9bdb25ed77d9..35431a092157bcfc2992a457933ea1bf389743ee 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkResetRestrictionCheckerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index f6e40245177594929dc54a13767aad2f59174780..7b940456c05c5a414c5cf8ee2145f7c74fd47c4b 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -25,6 +26,7 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index 8a47a80c2718f2dcb4045cdd7fb62d91605ace7d..83fa55cfe0aee0f597e3032231b745226a3e2373 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -16,6 +16,7 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; @@ -28,6 +29,7 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index 72f36c66989fc6c047075f3acd3e9e8aac91faeb..76e7bcbf29b7c34b5a82fec3529ced95b74d7f81 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -20,15 +20,14 @@ import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.AlertDialog; -import android.app.Fragment; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; @@ -40,16 +39,16 @@ import android.widget.Button; import android.widget.LinearLayout; import com.android.settings.R; -import com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; -import com.android.settings.testutils.shadow.ShadowOs; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.shadow.ShadowOs; +import com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java index eff20d34857553e6979c53e71d896deca02d3ebf..0e308b2a059e6db1f03e68cb313d80eddb0346c8 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -16,17 +16,19 @@ package com.android.settings.network; -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OFF; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_MODE; import static android.provider.Settings.Global.PRIVATE_DNS_SPECIFIER; + +import static androidx.lifecycle.Lifecycle.Event.ON_START; +import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; -import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.atLeastOnce; @@ -34,21 +36,20 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.withSettings; import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; -import androidx.lifecycle.LifecycleOwner; -import android.content.Context; import android.content.ContentResolver; -import android.database.ContentObserver; +import android.content.Context; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; import android.net.LinkProperties; import android.net.Network; import android.os.Handler; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -66,7 +67,6 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; -import org.robolectric.shadows.ShadowServiceManager; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index 5bf675e91b0c8781d41f08f0be875b62d979800f..e800cdd76381bdb2dd52440d8e95581125f66698 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -34,6 +34,7 @@ import android.content.IntentFilter; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 0455d9fbdfa9e0e159d6912fffbca0252f5b53e4..11541ed2ab276d38fbed7118c777889cbf68860f 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -16,9 +16,11 @@ package com.android.settings.network; -import static com.google.common.truth.Truth.assertThat; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + +import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -26,7 +28,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.net.ConnectivityManager; import android.net.IConnectivityManager; @@ -34,6 +35,8 @@ import android.net.NetworkRequest; import android.os.IBinder; import android.os.UserHandle; import android.provider.SettingsSlicesContract; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java index 0abd428d0270d1063a46eff6b92dc3c130fa2af5..e3fc843a9b09ceff9a8dc4ea6927751e7976277f 100644 --- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java @@ -27,6 +27,7 @@ import android.nfc.NfcManager; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index 9e7e4f4df0812c994b396dd6ce05c3e927c0ce5a..5efa94aaa98fa4bb41536a7c62ef986d45318e61 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.SwitchPreference; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java index 4d40b122368b3265674f1213b146114ac6bbec39..7938ad11c7e2b9ffe4224a5ef2345e4569c3dd5b 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcForegroundPreferenceTest.java @@ -17,12 +17,14 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index f65866a4a000208198b235e53783c26dcda0a7e4..026f392a5f315ce3f968ad9caa2ff72a2f118137 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -27,6 +27,7 @@ import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.PreferenceScreen; import androidx.preference.SwitchPreference; diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index 6feed46dc126f5380a1a318130edeae5f092dc7f..d57993262f54a17750f8d8e5738ee481fb0338bd 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -18,6 +18,7 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 2f383fe3c606e683ed6138f3d7c032301c8425f1..6537a405c766d6d705c7364cf6f697ded57f612d 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doCallRealMethod; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; diff --git a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java index 4f48b779b6c9272814263d6620f430bc59373829..517c94b9fe77d5c47d2470accde59741f4dfcd04 100644 --- a/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AlarmVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index d89897282f2667ebe0447da2e61bfd180df5935b..a9df13569e2118edc640b34137efc9c8f524661c 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -35,6 +37,7 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 84407eb2acc7a7da8d7ef79d3926f8a3d704e336..83c0b06b8ac6eb99ae940677588119c6903f406a 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -19,8 +19,10 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -31,6 +33,7 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index 96dbd623a7890cf38c9c4342bbfec831903a240a..dc368a254b625321c049528edc20dfad6d1eadcd 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -37,6 +39,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 68991246ae10915e064763aaaf59073d3b291bd8..2a404d6e888cb67c9185d92ba4246ed761dd929a 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -22,6 +22,7 @@ import static com.android.settings.notification.BadgingNotificationPreferenceCon import static com.android.settings.notification.BadgingNotificationPreferenceController.ON; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java index a13946e775e1d8a908240963307baf1766d95917..c77fbad34a953929ca4f704e8c5fab9315ba7988 100644 --- a/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BlockPreferenceControllerTest.java @@ -22,9 +22,11 @@ import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index f2e50e9f6fc84363ccc89f4a68666456ee869951..0aa94c7c1ab3c2046404252bc3273da0cfdee380 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -17,13 +17,15 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index f20409a6abde98629c5e4d9108584af5f7fc9487..c3c0a33b0efe96dcc6de89bbedb878fe790dfd17 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 894ec07a8d5b4069f3433a70b9a52e8e08b03a37..ceffe28e852b6389b595df65fe622993aab5738d 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index 5f3a616a2732f98c86311e224ab3804c74c9af60..4f813bd963b3827535ba313126d0bb8d33c499a1 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.notification; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; import static org.mockito.Mockito.mock; @@ -30,6 +31,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 8901a5df17c6ba3598a3f07015e2eee451425e2f..0d82fcb60896f6f47c8996279b941b54d799a3a5 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -18,8 +18,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -30,6 +32,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index 881a307c88c3494caadcb8a38aaf9f006e155356..84ed1345e2aee6c9b18517380d6523f8331b2885 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -24,10 +25,11 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index 9f90e2689617e0289fcba739bfeddcfb672190c2..e086e7fc64f508317cf683e80a07a4c4e50a14b1 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -17,12 +17,13 @@ package com.android.settings.notification; import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; -import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -35,13 +36,13 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; -import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 74ace1dd76440ac13bc895cbfd1c2926e911461a..451b78548a2d5a523ec360fe44c937b700829734 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.doReturn; @@ -26,6 +27,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; + import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index 3afb343f9063c3a91235a72da6ef5f126e294ce7..ade8bce631d08b86d37b61f702c9cad7a1a5dbc5 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java index 93273c862759c21fb4a25f15fdcaf3693b9dd5ae..ef382111ce2d55b8f46e57aa8208f050e167a904 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyString; import static org.mockito.Mockito.eq; diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 0dba467779b558cf2b2deca632b5747afdb225c3..36b988453050a5ae49aaaf758661bcf88a5978f1 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -24,9 +25,10 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; +import android.telephony.TelephonyManager; + import androidx.preference.DropDownPreference; import androidx.preference.PreferenceScreen; -import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 26f516508bca284cb213473e6fdeca68710c0df8..cc35f6027973746cb5bdc236fd577a63ab9c6ac8 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -17,8 +17,10 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -31,9 +33,10 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceFragment; import android.view.View; +import androidx.preference.PreferenceFragment; + import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 5557cfd6dfd60cbdad1f5c12ad0478a3ad03708f..0c706fbdaaf16d40d9cb109b35ff4ef739c61e52 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -20,10 +20,12 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertNotNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -34,9 +36,10 @@ import android.app.NotificationChannel; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.RestrictedListPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index 02b85e11cae8245332848be14d3958434b9042d6..c2768259a32595dc3566b03a7e77941dfb3bde20 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -21,8 +21,10 @@ import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -36,6 +38,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index 0d493150f3cc6bd80eec3ca884c2226ffc82f513..af810ace4780500d7b5bd1e869692dd09794f3a3 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -17,17 +17,19 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index 7eeee98982c727b2fa8a5504dc2eb016008e71b1..c897fb54706b46c37dd30ab5cabda942e52b20cd 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -22,8 +22,10 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.any; @@ -37,6 +39,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java index 9d805e8785dea93ab60259b3ab72446a32122eb8..cd3fad716288f24be7024fa1dc7dffeb92e757c6 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index e429f9a292831e85c2a344fffe233b3b1dc987b1..65c60c7222b5143547c79b0568d027bf7cca68de 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static android.app.NotificationManager.IMPORTANCE_NONE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -27,6 +29,7 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java index 98cbc76dc5888f487247427ac4a54985358313bd..7a98386ea2485d79940ed17780553e1a95d26b12 100644 --- a/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PhoneRingtonePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index 119f5835bba6ee0f3d474106447e896da52f98d2..1cd98477238002b86c47e21279720655305cd212 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -17,13 +17,16 @@ package com.android.settings.notification; import static android.provider.Settings.System.NOTIFICATION_LIGHT_PULSE; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 9dd077f092f850a0f7eac3f30a2d72ee7f27030d..71bc15c6982a1c1f999d6ddc106890dfcf14101b 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -40,10 +41,11 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.service.notification.NotifyingApp; +import android.text.TextUtils; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java index 65bc7e6c40e433151336e63ea3f880e0db34c7fb..50a01bc89dc341d3222e816a85a049c57e389427 100644 --- a/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingVolumePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index c6b055b04b9898ed39e25c93b5c2ff064566dc28..3bd3292789507da992bca9d5a3792b07b76592ef 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -17,12 +17,14 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.media.RingtoneManager; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index 4e91eafe2fe87538f07225cb1a1cb1f8eae1f22c..a1c6d99b4c1fdb2fc842cc746b10f2803a550443 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 38e91a4c9a66944d9ba7a04c2daa82b9339389e9..5b43508f2d243778f6d7c7933e461809d3853a0f 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.notification; import static com.android.settings.notification.SettingPref.TYPE_GLOBAL; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -27,6 +29,7 @@ import android.app.Activity; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings.Global; + import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index b98a68fadf34432700b355505d3f5e83d7cf140c..3fc563a3a8e754c341134d35123a73ad7d0a2528 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; @@ -40,9 +42,10 @@ import android.content.Intent; import android.net.Uri; import android.os.UserManager; import android.provider.Settings; +import android.util.AttributeSet; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.AttributeSet; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 4eef4b626fba15c973a4cda6fd8da469a40b8baa..3510a60eb1fa592fac70512663575a861016d2f1 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -26,8 +27,8 @@ import android.content.Context; import android.media.AudioManager; import android.os.Handler; import android.os.UserManager; - import android.preference.SeekBarVolumizer; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.XmlTestUtils; diff --git a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java index 622d5cd89672596eb3feffe3afd3281aa5e7c8ce..9bb380df01e5fa8747bcf62a997028afe54da332 100644 --- a/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java +++ b/tests/robotests/src/com/android/settings/notification/SuppressorHelperTest.java @@ -16,6 +16,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 8dd8f2453ba21271cbb8a827b9564e6083f8e7f9..6c77b10909b036241f97c5ebb1c6ab32a0093142 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -26,8 +27,9 @@ import android.content.ContentResolver; import android.content.Context; import android.media.AudioManager; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index c391c1344ba39ffb054330e1c8bd7647dcbc51e6..8c0bb456a4d124ac85352b25c5d936cbd5f28940 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; @@ -25,8 +26,9 @@ import android.content.ContentResolver; import android.content.Context; import android.os.Vibrator; import android.provider.Settings.System; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index 82357d8f6bc3566ddb2a07a0eb83afb5124dfd3b..aa1824d7d53e022adaf26ffc2b2b2e5dac23861e 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -30,10 +30,11 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index ce908952a86c71c8f0218c5f431656abe3d69379..69438e221ec18f7450439cda7b75765944f82687 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -20,8 +20,10 @@ import static android.app.NotificationChannel.DEFAULT_CHANNEL_ID; import static android.app.NotificationManager.IMPORTANCE_DEFAULT; import static android.app.NotificationManager.IMPORTANCE_HIGH; import static android.app.NotificationManager.IMPORTANCE_LOW; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -35,6 +37,7 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.os.Vibrator; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index e37c852277fcd86dbae9d3d64fd8dbc3a0d510f1..b9f9021e74cab74f2ade6c105ffb4f0a0619ccf5 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -23,8 +23,10 @@ import static android.app.NotificationManager.IMPORTANCE_MIN; import static android.app.NotificationManager.VISIBILITY_NO_OVERRIDE; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; + import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 7b9af3e9a346b73da4e460e8294e938a8ee1f136..99a97c342e24e03bbbc402569b36a73e254ec05a 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index eb6adfc71e9f326940fbabca17924a3bd60928e4..4397e71c653f2eac97ef119bfb96b9f72d6d17d4 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -28,11 +29,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; +import android.telephony.TelephonyManager; + import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.TwoStatePreference; -import android.telephony.TelephonyManager; import com.android.settings.DefaultRingtonePreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index 40dfc4105e7e3a433c467d70ab3b0728b74ee707..c679205ee1e25136921cc4488de70bfec6e4affb 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -22,18 +22,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; -import android.widget.LinearLayout; import android.widget.RadioButton; -import android.widget.Switch; + +import androidx.preference.PreferenceViewHolder; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.MasterSwitchPreference; -import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index 8c7c32608cb459b3096c918cd2f1ca5b20e7193d..81ed5ef0bd41d74b58d96de6ee0e552499edd07b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -34,6 +34,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index 4325594ebcf5d55234fe63913a7eec2e7ad20a19..7caccf2d2fc2be0e62c8931929a833ea0e49ecfa 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index 552361a57840781c74fa5c6ad17c397cfd258225..2dd286d82df5be2d5f7d11b4244edf48fa9541cf 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static junit.framework.Assert.assertEquals; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,6 +26,7 @@ import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java index b3a4b90b09893e5660592ba29b0c5a6edc359743..f1f1b2ea488d9b49c7e8d277bd64b37b66968aa8 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index 0bf82144260fc7f24560463c59b33b5e534ac7d4..4170ee89f198249fd65e01c793fbcbaba7a6b3d0 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -21,11 +21,10 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static junit.framework.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.mockito.Mockito.any; + import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -37,9 +36,10 @@ import android.content.Context; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; +import android.util.ArrayMap; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.ArrayMap; import com.android.settings.R; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java index e30fc71eff153be7cf74fdc6c00aefcd01692f5c..11cdfcc2697599af6064f65e4211a54d00f94734 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java index d3fab8fdf26cfe9b41c9840a6d04f1a3e0c9b623..c854e8ad357a47fb91fddab92207fbf0658f1a9e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index 10bd641cfd14c8804cc2843f1cb8787e618b48ff..320b5f91d09ff82f48b32e7e81e967b09fa980d0 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -30,11 +31,12 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.view.View; import android.widget.Button; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index 8ecc9551feb2197127c06cac292c2ce89a37de18..3093b6a0c0fb4f6eaf4e0d24ac666df6179b801b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -29,6 +29,7 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index c03e95b672e59604d5b1684636fc7c6a91c7f445..5c55765942e1a7d4c7eb203319e1be82fa5431bf 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -25,6 +25,7 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; @@ -38,7 +39,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index c0f6768bc687d992037276ac8dc496e7fed6e971..7d5efa7c0651af6a237a35bc2b45abf0b644f58b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index 870981468e431ccbbf4f05485d46adeda38aafe4..f5eca34bf62a77b622d21515d6b567bfd0a730fd 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index dd4b408e525b31b3470fe31ae58adb65d4294ee4..37ffd78611807c2e2ec381f4d9e737826f86b2e2 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,6 +29,7 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java index 3ea4471fadcd8f9e5deb22cdbbc6cf4964c18e06..aaa4d0ed30676cfd46085c41cc38a463ce06eff4 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.app.NotificationManager.Policy; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index 2e7f35cbf59dc396b891c07733a16f8df5ede53b..4ddb5fca455cc5354ae54c67fd1cba7ea886a3ee 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index cb79d649f89010e0485c9163921350f0d1e40bb7..4518427ad6cb0dd3c06a6d7a6fd51dd90ca0abf5 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -28,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java index 23b242a2fa0f0c9ab8c8de9f0d3bebb125ca1202..559ba72ec71bf82852f407defbbbc3183d597f2e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeScheduleRuleSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index fcf54ead81400ebb40afa05637b3f36e5ce0acf4..b6efd78dda7892547bdb6be5073ad32806cd43a7 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -21,7 +21,9 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_OFF; + import static junit.framework.Assert.assertTrue; + import static org.junit.Assert.assertFalse; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -36,9 +38,10 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; +import android.util.ArrayMap; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import android.util.ArrayMap; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java index 39e9271fa2fcea97fd3077b96c841f32a408ecf4..96e565829950379f75c7c29fa4e86bc607b03813 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import android.app.NotificationManager; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index e3ba8033922c5b731d942b96e57a9000b0cb1fce..bfc5c428f0583ea229084c8d32cef4c602f4fcdf 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -29,7 +29,13 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.provider.Settings; -import androidx.core.graphics.drawable.IconCompat; + +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,13 +50,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @Config(shadows = ShadowNotificationManager.class) @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index 754e66dbfff6316065b4042d2dc87d1958506467..3926a45d96eba4dee3af3ecf6a42b9055da4fd19 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -29,6 +29,7 @@ import android.app.NotificationManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 54d6afec612bfbc56250bc9748edbad884fbcd7d..418af7880b39081ca203a55bf64f14b5396ae85e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -21,8 +21,6 @@ import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; -import static junit.framework.Assert.assertEquals; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,8 +29,9 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,9 +41,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowApplication; import org.robolectric.RuntimeEnvironment; +import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 2fb747e4b88f48688f91da6ea74a085402e7ce31..71720bfaffe1e285567f6629a000084768c1599c 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -21,10 +21,8 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; @@ -36,13 +34,13 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; import android.content.res.Resources; -import androidx.preference.CheckBoxPreference; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settings.widget.DisabledCheckBoxPreference; +import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; import org.junit.Test; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index a20b7e16d14fdbf229d403997706ff37dcab6155..3cada1ed7930aae3fcf91acfacdc7cd4df82e275 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -30,23 +30,18 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.DisabledCheckBoxPreference; -import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index 9f8e91ac7a414b6eea023e3cb7c88a712d12f0ff..f3658823a4330f6ffd6ef5cf656ec8a61d4ff400 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -26,21 +26,16 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OF import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_CUSTOM; -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent - .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index fd22166563bd575703f4778087e2fea56b716877..08384af610a2f6a67d95c3f3912e3d83aa478a9a 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -29,23 +29,19 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BA import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyBoolean; -import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.DisabledCheckBoxPreference; -import com.android.settings.widget.RadioButtonPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java index 609b3a5ce87e75a8b26111867589a07c9fc19939..87cb781170f35150cd08ea1fb8502305e5076958 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java index 75b6bb4b14ac94591e53b1072b37aed60089561f..3a05e77eb6842dceb69bc7a5acfad3520fb8813c 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java index e07351cd34a73b190a8b4a17212ff134f677e2ac..575f08c699d62d4e858041386d20e69bfcb67596 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index 2a8c406551b8c8e0a34433da2b9d6f40f2d4ea4d..5d51178b65ccec64bff78ac03508c6a2d9c8d470 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java @@ -1,6 +1,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java index 9d72bd883da2d0c178c474bba8a91a9b4022039b..836311757c41518af3424ea282402a73111be055 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.Shadows.shadowOf; import android.content.ComponentName; diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java index b5572574d6831c178088fac64dc8fa53de0af22c..a15fc2f6d0be1e5b5446aaee8b755dbed1a570fe 100644 --- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java +++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static android.content.pm.PackageManager.FEATURE_FINGERPRINT; + import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment .HIDE_DISABLED_PREFS; import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment @@ -24,7 +25,9 @@ import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericF import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT; import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE; + import static com.google.common.truth.Truth.assertThat; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java index cef18741401b2a7fa74150f37c6d4c254643f5e0..ded379b53582cfd4d700f57a9b9a62a3221c49aa 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java @@ -17,6 +17,7 @@ package com.android.settings.password; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 1b48da80c5135181528f54050d0a6c66fc0dc6ba..51988ff975e18ed14559111b8a82395ad9bdf01f 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -18,13 +18,14 @@ package com.android.settings.print; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; import android.print.PrintJob; @@ -32,6 +33,8 @@ import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedPreference; diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java index df60654c1f006ec0f0313e7702589f2e648e81ee..27f902a2baa0f8b2ef3cac5b6ad45e408e8ab3ae 100644 --- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java @@ -17,6 +17,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index e99b0ea4aaa4063fee51d024cf2c6676d8755a00..ff82fa32f150100fbe8fbeba9548c17bb995d626 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java index 1c02b99323d17d7e5f3038bab479b1ef056759a0..43ce96611d02eb184b3dfac80b2944bc3494e924 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java @@ -16,7 +16,6 @@ package com.android.settings.search; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -30,6 +29,10 @@ import android.app.Activity; import android.content.ContentResolver; import android.net.Uri; +import androidx.slice.Slice; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceViewManager; + import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,17 +40,11 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; import org.robolectric.Robolectric; import java.util.ArrayList; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceViewManager; -import androidx.slice.SliceMetadata; - @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexUpdateJobServiceTest { private static final Uri BASE_URI = new Uri.Builder() diff --git a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java index cbd68c0471203e62c254a9c392292e66f1944b9b..ffa04ecb8ddd3140bf0eedebd2e4b2f3c395ed3c 100644 --- a/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlinePayloadTest.java @@ -1,6 +1,7 @@ package com.android.settings.search; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java index eb6ad6e970cc44f2afbff45cc5ad733c30599c07..add0a90202f3b6ebd00a97e67764d08c856e96f6 100644 --- a/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java +++ b/tests/robotests/src/com/android/settings/search/InlineSwitchPayloadTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE; + import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java index 38d90e4cfd148b7f09465d4d26de072597d09a60..974bee07e95ab337426e9ab460f6020ce2362b48 100644 --- a/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java +++ b/tests/robotests/src/com/android/settings/search/ResultPayloadUtilsTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.fail; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java index eeebdee96e3a760d5ea8bafb4df78d8f8836911c..eddffba82e9b2e7fde1eb5925bd78f51f04b9ce6 100644 --- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java @@ -18,6 +18,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index eff95fe327fd408640ce56eab96431b67420d9a6..36a0dc9f8aae65e03409b8279898dfade08dad17 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -17,8 +17,11 @@ package com.android.settings.search; import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE; + import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.fail; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java index f6e14735b37a4c4d716b2c0c08b155b7906f0b10..89d3ac0fe4a07d44ed6e3bf94327c3aa97998307 100644 --- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java @@ -1,6 +1,7 @@ package com.android.settings.search; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java index 620cb0c0ed9bd869d3a7f3cbdc98b5c1d87fec4a..8d29898aabe6aeb300469293e4a3bcb709f74af5 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java @@ -17,6 +17,10 @@ package com.android.settings.search.indexing; +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.spy; + import android.content.Context; import android.provider.SearchIndexableResource; import android.text.TextUtils; @@ -40,10 +44,6 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.spy; - @RunWith(SettingsRobolectricTestRunner.class) @Config(qualifiers = "mcc999") public class IndexDataConverterTest { diff --git a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java index 18f05b694296dd4baa252064ce132b0ab492e2df..cb78e8c2fd436132a4db84a0ff60cf44a0c01a22 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java +++ b/tests/robotests/src/com/android/settings/search/indexing/PreIndexDataCollectorTest.java @@ -18,6 +18,7 @@ package com.android.settings.search.indexing; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; diff --git a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java index 6cc1704bf397aca339c2f1a575165e65350ab9c4..18375908a3254a14df7b82a8b1058e6f78f05d85 100644 --- a/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ChangeScreenLockPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index 493c166b14ecb1dc1c456da0a80ecabc0459b781..ebe420512be420db3dca354fdb76f29135235fcf 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -19,6 +19,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; import android.content.Context; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java index 6e49f1e394990b127a7674c112d07751cf8404e3..45555755255fab7b8f35422d370566a90f216222 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionAndCredentialTest.java @@ -17,7 +17,9 @@ package com.android.settings.security; import static com.android.settings.security.EncryptionAndCredential.SEARCH_INDEX_DATA_PROVIDER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 944f9fd4e60962806e0cbff63fc62dc88b116dfd..ee9fb16d1fa0959df663c42dda5de0451b5c0b3b 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -16,12 +16,16 @@ package com.android.settings.security; -import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_DETAIL_PAGE; -import static com.android.settings.security.EncryptionStatusPreferenceController.PREF_KEY_ENCRYPTION_SECURITY_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController + .PREF_KEY_ENCRYPTION_DETAIL_PAGE; +import static com.android.settings.security.EncryptionStatusPreferenceController + .PREF_KEY_ENCRYPTION_SECURITY_PAGE; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.UserManager; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index 728fda65ab266016eefca074092fdc94cc41e571..fb6503eaccc2f5194a820501baabee6e526b6cef 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -17,12 +17,14 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index 3feb4a9252552f4d98dcddbca71089cf1619240c..cf8bc14a71e5a4e8ea5573ca2c78fb208208e93a 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -16,12 +16,14 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 5568553b7c9d243ff21baf66b9ceac506a4a6da8..6533ae4888780e5f582402b744c42017fa23d563 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; @@ -29,6 +30,7 @@ import static org.mockito.Mockito.when; import android.app.FragmentManager; import android.app.FragmentTransaction; import android.content.Context; + import androidx.preference.PreferenceFragment; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index b41ec461a08c4bdfd3d62a4d1e1fd733ac3188c7..6bd5e1fc34d9abbac14e4ceb312d49d00ea023f3 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -18,10 +18,11 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index e8906cba15e1a97d80b10204cea271b9cf485b9f..1851ed52afbd2947df45f0909eb9152beaaf5bcd 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; + import androidx.preference.Preference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 5928587798de81337d27994e331fbcfa54be1702..6b968e6f195da5a10852ab41bd8f3e53c0406f76 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index 4a12c5a2397717cdc5635b545f424dacbba3756c..f20587db2ea8fd903ebc74ae09a15ec35f2a394a 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.security; import static android.telephony.TelephonyManager.SIM_STATE_READY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -25,13 +27,14 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.PersistableBundle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 1d65aed2015b92581a0dcea2696557188a1aa25c..08fdd7d5e5165ca1e27c74f31f73f56c562e4d5c 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -19,19 +19,23 @@ package com.android.settings.security; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.PackageManager; import android.hardware.fingerprint.FingerprintManager; import android.os.UserManager; +import androidx.lifecycle.LifecycleOwner; + import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java index 2a4b335cfa39d8c901278cc93449353685e1d545..0c7f3853442a5c7dc44945d3c113423952d76e70 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceControllerTest.java @@ -17,7 +17,9 @@ package com.android.settings.security.screenlock; import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java index fc555c4502ac0dd193f7dca64c41784dd5414a58..6348bf2b9b8e39784bfa1937ef618537b4885657 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/LockScreenPreferenceControllerTest.java @@ -18,17 +18,22 @@ package com.android.settings.security.screenlock; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; + import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.os.UserManager; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java index 0b5d29d9284313961ad6b3235424134758537a62..9d7a5071bf46a782e5d569860c4bb3523c476e74 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index c30c53ebb885b78f3957085f2b5e0e75a42ef36c..028145584d1b249b8d754dea49c9744ee1660d7a 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -17,11 +17,13 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; + import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java index c1d7dd2479191897d001237f470790f52f993239..6d378ef3d8907090657e000fbb11c10ac5235417 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/ScreenLockSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.security.screenlock; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java index eedb2da4c07974bf538cc2121e70be412d2e7b3d..07269bf644837b5f2a9f2ef44b3be8ecf4c393ce 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; + import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java index 94298be696d57e5ec940e1220e901641e3d04562..d8ace148292f767e2adc4b4c05183aca9eda5551 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentListPreferenceControllerTest.java @@ -16,9 +16,13 @@ package com.android.settings.security.trustagent; -import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_SECURITY_CATEGORY; -import static com.android.settings.security.trustagent.TrustAgentListPreferenceController.PREF_KEY_TRUST_AGENT; +import static com.android.settings.security.trustagent.TrustAgentListPreferenceController + .PREF_KEY_SECURITY_CATEGORY; +import static com.android.settings.security.trustagent.TrustAgentListPreferenceController + .PREF_KEY_TRUST_AGENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.mock; @@ -27,9 +31,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java index 9cee3d1f1192d8269781abd61836351b7cfac2f0..668734e14d2865ffff077f618616aff878843207 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/TrustAgentManagerTest.java @@ -17,6 +17,7 @@ package com.android.settings.security.trustagent; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.pm.PackageManager; diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java index 21bef6131c97995d3b27674038784a5061dea1d1..f139720c90caea27b5662a43951d45ade5d34102 100644 --- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java +++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java @@ -18,7 +18,9 @@ package com.android.settings.slices; import static android.content.ContentResolver.SCHEME_CONTENT; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -36,6 +38,8 @@ import android.os.StrictMode; import android.provider.SettingsSlicesContract; import android.util.ArraySet; +import androidx.slice.Slice; + import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.location.LocationSliceBuilder; import com.android.settings.notification.ZenModeSliceBuilder; @@ -63,8 +67,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import androidx.slice.Slice; - /** * TODO Investigate using ShadowContentResolver.registerProviderInternal(String, ContentProvider) */ diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index 25f0d0cb1630dba81b396ffbe9e58056d8020a11..1353bc714c8390e1095eea4f01b0cab60f446993 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -19,7 +19,6 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -40,11 +39,11 @@ import android.util.Pair; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.core.BasePreferenceController; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.FakeSliderController; import com.android.settings.testutils.FakeToggleController; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java index 96e475e9fbed07c4c961f5808a611b718034a4e4..24979085cf6fb511869b15fd043f58e156bb2341 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.app.PendingIntent; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -34,6 +33,10 @@ import android.provider.Settings; import android.provider.SettingsSlicesContract; import android.util.Pair; +import androidx.slice.Slice; +import androidx.slice.SliceProvider; +import androidx.slice.widget.SliceLiveData; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -50,10 +53,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.robolectric.RuntimeEnvironment; -import androidx.slice.Slice; -import androidx.slice.SliceProvider; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class SliceBuilderUtilsTest { diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java index 9c8b9462c9256576ac302c07428851d683a2a2c3..213de11bf56aa96c11ed09f779b4a0fa588ea965 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java +++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER; + import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 674d6299a1e2205e5de11a02dbf657e679c503a2..a7df5a740281a27aaabfea131a794de6d72de493 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -33,10 +33,10 @@ import android.text.TextUtils; import com.android.settings.R; import com.android.settings.accessibility.AccessibilitySettings; import com.android.settings.accessibility.AccessibilitySlicePreferenceController; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index c571d85ccb0f4c42da0141bf62260ed71063a4fe..bea5e8933a3b8836ec53d9bb356ec586ba4e49d9 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -27,11 +27,11 @@ import android.database.sqlite.SQLiteDatabase; import android.net.Uri; import android.view.accessibility.AccessibilityManager; -import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.search.SearchFeatureProvider; import com.android.settings.search.SearchFeatureProviderImpl; import com.android.settings.testutils.DatabaseTestUtils; import com.android.settings.testutils.FakeFeatureFactory; +import com.android.settings.testutils.FakeIndexProvider; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.After; @@ -40,14 +40,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowAccessibilityManager; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import org.robolectric.shadow.api.Shadow; - @RunWith(SettingsRobolectricTestRunner.class) public class SlicesDatabaseAccessorTest { diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java index 783ffa0c65c3647b008a2a9f48acfa4227c2c64e..602a7fd8217a0d5918964507f219dcb75f949849 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java @@ -17,6 +17,7 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 748aa0ca302651728965d48745fa3efffc4e27c2..460979426e2b7e232aba71915bf69a1d921323d6 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -36,20 +36,20 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; - import static org.robolectric.Shadows.shadowOf; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; -import android.content.pm.PackageManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; +import android.content.pm.PackageManager; +import android.util.FeatureFlagUtils; + import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; -import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.core.FeatureFlags; diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 4e67143c084085a6d4c0a9deb89f77552b0b28e8..a90f39de06411db5feda2c4ff24f3e38d976cf05 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -34,6 +34,7 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index e1b930169809067721bdc3a0dbfedfebf79f66da..732affa171e38b810ddc338ac321dd2f393e3259 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -36,6 +36,7 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothManager; import android.content.Context; import android.media.AudioManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java index c6583c7eb0304aead657217d4eb890c3b6283e11..a6acf2773ebe2a7f498e84594b73db3867279493 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java +++ b/tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java @@ -30,7 +30,6 @@ import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.fingerprint.FingerprintEnrollSuggestionActivity; import com.android.settings.fingerprint.FingerprintSuggestionActivity; -import com.android.settings.notification.ZenOnboardingActivity; import com.android.settings.notification.ZenSuggestionActivity; import com.android.settings.support.NewDeviceIntroSuggestionActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java index 8b03376afe37cd045d73b4c753fe6b22ef034b84..c819f48560bbf852bd75c61b4e647103fb8cf008 100644 --- a/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/support/NewDeviceIntroSuggestionActivityTest.java @@ -16,14 +16,17 @@ package com.android.settings.support; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PERMANENT_DISMISS_THRESHOLD; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_COMPLETE; -import static com.android.settings.support.NewDeviceIntroSuggestionActivity.PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME; - +import static com.android.settings.support.NewDeviceIntroSuggestionActivity + .PERMANENT_DISMISS_THRESHOLD; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity + .PREF_KEY_SUGGGESTION_COMPLETE; +import static com.android.settings.support.NewDeviceIntroSuggestionActivity + .PREF_KEY_SUGGGESTION_FIRST_DISPLAY_TIME; import static com.android.settings.support.NewDeviceIntroSuggestionActivity.TIPS_PACKAGE_NAME; import static com.android.settings.support.NewDeviceIntroSuggestionActivity.isSuggestionComplete; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index b44a719624f2a4916362e2f3ea1011125885bf66..dd54d6e094c3e5ede1edb1d5e5ad9696d85cc37b 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -1,6 +1,7 @@ package com.android.settings.survey; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.never; @@ -12,6 +13,7 @@ import android.app.Activity; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; + import androidx.localbroadcastmanager.content.LocalBroadcastManager; import com.android.settings.core.InstrumentedPreferenceFragment; diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index 0c26650798a0183ed0b7d8c5ef71830023a61959..4245c96e45095e30b41a77137fc94415b85aa0a1 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -20,7 +20,9 @@ import static android.os.SystemUpdateManager.KEY_TITLE; import static android.os.SystemUpdateManager.STATUS_IDLE; import static android.os.SystemUpdateManager.STATUS_UNKNOWN; import static android.os.SystemUpdateManager.STATUS_WAITING_DOWNLOAD; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; @@ -28,6 +30,7 @@ import android.os.Build; import android.os.Bundle; import android.os.SystemUpdateManager; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index f071f173633697e226be09bd006385add7762876..176793f9e028752470414c06c2c8a2ca4b2ad168 100644 --- a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java +++ b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java @@ -15,8 +15,6 @@ */ package com.android.settings.testutils; -import java.net.MalformedURLException; -import java.net.URL; import org.junit.runners.model.InitializationError; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; @@ -24,6 +22,8 @@ import org.robolectric.manifest.AndroidManifest; import org.robolectric.res.Fs; import org.robolectric.res.ResourcePath; +import java.net.MalformedURLException; +import java.net.URL; import java.util.List; /** diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java index 332617b8a2f67c25fe00dc04557ba8b6985c37d6..3f0a023d4ecc36132bb00914877b0c9d161af1b2 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -21,22 +21,12 @@ import static android.app.slice.Slice.SUBTYPE_COLOR; import static android.app.slice.SliceItem.FORMAT_INT; import static android.app.slice.SliceItem.FORMAT_TEXT; -import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; -import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; -import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER; -import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; import android.app.PendingIntent; import android.content.Context; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - +import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.SliceItem; import androidx.slice.SliceMetadata; @@ -45,13 +35,16 @@ import androidx.slice.core.SliceAction; import androidx.slice.core.SliceQuery; import androidx.slice.widget.EventInfo; -import androidx.core.graphics.drawable.IconCompat; - import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceData; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + /** * Testing utility class to verify the contents of the different Settings Slices. * diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java index 2b27649a926159c6041327d80fd8922ed308b153..7e8493e0efe08dedeb9a11df3741c506fed5a49a 100644 --- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java @@ -1,13 +1,14 @@ package com.android.settings.testutils; +import android.content.Context; import android.content.res.Resources; import android.content.res.XmlResourceParser; - -import android.content.Context; import android.text.TextUtils; import android.util.AttributeSet; import android.util.Xml; + import com.android.settings.core.PreferenceXmlParserUtils; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java index 00aa9ec8244fc605301b05384c438f4bc1b13ca2..124b5ead8a4978357c06a51dd93cb08847a31eef 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowBluetoothDevice.java @@ -17,10 +17,7 @@ package com.android.settings.testutils.shadow; import android.bluetooth.BluetoothDevice; -import android.os.Parcel; -import android.os.Parcelable; -import org.robolectric.shadows.ShadowBluetoothDevice; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java index b184eb2a49e45a4da6e3b9c5e04fe5288ec4abc5..226100238fd442f44f5f7559a05a4e8df49e95fb 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -1,6 +1,7 @@ package com.android.settings.testutils.shadow; import static android.util.TypedValue.TYPE_REFERENCE; + import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.Shadows.shadowOf; import static org.robolectric.shadow.api.Shadow.directlyOn; @@ -14,13 +15,14 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import androidx.annotation.ArrayRes; -import androidx.annotation.ColorRes; -import androidx.annotation.Nullable; import android.util.AttributeSet; import android.util.SparseArray; import android.util.TypedValue; +import androidx.annotation.ArrayRes; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; + import com.android.settings.R; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java index 12173c8f1deab4fa7ec829df3add5d4c59bd2742..c41aa8ee2232eb11eca3fad02c3704fca7811a86 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAppInfoBase.java @@ -17,6 +17,7 @@ package com.android.settings.testutils.shadow; import com.android.settings.applications.AppInfoBase; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java index 886f94157ea0e804f0e44de5ee5c8df04e87068c..cee04ca351efef72497b605f55679be4ae2af3ce 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioHelper.java @@ -18,7 +18,9 @@ package com.android.settings.testutils.shadow; import android.os.UserHandle; import android.os.UserManager; + import com.android.settings.notification.AudioHelper; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java index 3c3714547dd4142e7ee0bdaf1554c22a7baf2d6d..bcf90c440fb533f0f08a3a3c06fc2fe26b9a0c79 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -18,12 +18,12 @@ package com.android.settings.testutils.shadow; import static android.media.AudioManager.STREAM_ACCESSIBILITY; import static android.media.AudioManager.STREAM_ALARM; +import static android.media.AudioManager.STREAM_DTMF; import static android.media.AudioManager.STREAM_MUSIC; import static android.media.AudioManager.STREAM_NOTIFICATION; import static android.media.AudioManager.STREAM_RING; import static android.media.AudioManager.STREAM_SYSTEM; import static android.media.AudioManager.STREAM_VOICE_CALL; -import static android.media.AudioManager.STREAM_DTMF; import static org.robolectric.RuntimeEnvironment.application; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java index 55c1c45982e6056b9632d64c22a90d6896b9ee5f..75526c850516c84aa08c03b5aa1699770bebf9a9 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java @@ -17,9 +17,10 @@ package com.android.settings.testutils.shadow; import android.content.Context; -import androidx.cardview.widget.CardView; import android.util.AttributeSet; +import androidx.cardview.widget.CardView; + import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowFrameLayout; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java index 50c0330828a3587d25e1fdf45b025bf73e7a5505..7c543b74b385aeba1e7745fb89e98492ce25835d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java @@ -16,19 +16,18 @@ package com.android.settings.testutils.shadow; +import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; + import android.accounts.Account; import android.content.ContentResolver; import android.content.SyncAdapterType; - import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; import android.provider.SearchIndexablesContract; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import org.robolectric.annotation.Resetter; - -import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import java.util.HashMap; import java.util.Map; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java index 34908ca39a8b945689c4d1398acbbd570167c48a..88b0b5fc0f799e29d5f0e7f876f6aeee69312010 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataSaverBackend.java @@ -1,6 +1,7 @@ package com.android.settings.testutils.shadow; import com.android.settings.datausage.DataSaverBackend; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java index 73cabfb1599435b771573b2c9efb977db7c0c48f..9b8821a6b5789f8d153716e6b693029a255ccf40 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDataUsageUtils.java @@ -4,6 +4,7 @@ import android.content.Context; import android.telephony.SubscriptionManager; import com.android.settings.datausage.DataUsageUtils; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java index f8242970130d7de3db45129b38a5505b03551db7..8aa5dab9107a13621ff032fc7cfeb29929d48131 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowDatabaseIndexingUtils.java @@ -19,7 +19,9 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.ResolveInfo; + import com.android.settings.search.DatabaseIndexingUtils; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java index f22c7d6a04539a92b3e846de2992320aa11cdfca..e4be3185ea7ec92aac02f0cda0f4c535b7a77f69 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,6 +19,7 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.hardware.fingerprint.Fingerprint; import android.hardware.fingerprint.FingerprintManager; + import androidx.annotation.NonNull; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java index faaa0f05bfd0b277dade87ad422d8a484180c69e..68c92a715692836c82bbb2d63a49c505d239f30d 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMediaRouter.java @@ -16,10 +16,10 @@ package com.android.settings.testutils.shadow; -import android.media.MediaRouter; - import static org.robolectric.RuntimeEnvironment.application; +import android.media.MediaRouter; + import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java index 8d7606335d2dc169f5d3683eb3cfa9b3a25013da..364083e699fae250430972eeb4ec5d4b645a3b42 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowMobileNetworkPreferenceController.java @@ -1,7 +1,9 @@ package com.android.settings.testutils.shadow; import android.content.Context; + import com.android.settings.network.MobileNetworkPreferenceController; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java index c11f79cc4da6ae5caa0dd8e5b47e84780458e26f..35c6630ba4729a029c80f72bcfb85eb29c82c679 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java @@ -18,9 +18,10 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.PackageManager; +import android.text.TextUtils; + import androidx.annotation.NonNull; import androidx.core.content.PermissionChecker; -import android.text.TextUtils; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java index f39f10f327be0e8163321acc15ca7332633a1df4..372116ca95d4cfc5f98692813602db6c56a4ad98 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRestrictionUtils.java @@ -1,8 +1,10 @@ package com.android.settings.testutils.shadow; import android.content.Context; + import com.android.settings.bluetooth.RestrictionUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java index 5a71b58ec7ab0ebb084083c3073c45aac1e8760f..d35ea5cb53589f0fedf9269b5a2ef880b045ea2f 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRunnableAsyncTask.java @@ -18,6 +18,7 @@ package com.android.settings.testutils.shadow; import android.os.AsyncTask; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowAsyncTask; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java index 834d285c955e91e9bd67d71bdff98d0ffb587e23..f11d9e889d2266a033d5f3edaa5f23342f27fde9 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowRuntimePermissionPresenter.java @@ -19,7 +19,6 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.permission.RuntimePermissionPresenter; - import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java index 586ff488351462cadbaf3a308f184cc40ef75c46..e5f95c37d043ee205734e658a19e00eb27cc7766 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsPreferenceFragment.java @@ -19,6 +19,7 @@ package com.android.settings.testutils.shadow; import android.os.Bundle; import com.android.settings.SettingsPreferenceFragment; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java index 8e24bd77a512a788c5e88ab3dec3b45bcdf40ebe..825e5aa3c4aa3abd25a59a7566cc757527d35808 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowShortcutManager.java @@ -20,12 +20,14 @@ import static org.robolectric.RuntimeEnvironment.application; import android.content.pm.ShortcutInfo; import android.content.pm.ShortcutManager; -import java.util.List; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; import org.robolectric.shadow.api.Shadow; +import java.util.List; + @Implements(ShortcutManager.class) public class ShadowShortcutManager extends org.robolectric.shadows.ShadowShortcutManager { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java index 03991e64e3ea267b143cec03fb266c708291ee5f..b465521448a0483b35d94b3039f6604636adf699 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowTextUtils.java @@ -21,10 +21,12 @@ import android.os.SystemProperties; import android.provider.Settings; import android.text.TextUtils; import android.view.View; -import java.util.Locale; + import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import java.util.Locale; + /** * Important: The current robolectric doesn't support API 24, so I copy the code * from API 24 here to make it compatible. Once robolectric is upgraded to 24, diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 10b2acb9ed0cefb98a349294c359414f62b4ee4e..12cde859cc4bc67a331245fbb6685a7760c5bd65 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -16,17 +16,19 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; import android.provider.Settings.Global; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index 782e94d39761912728371349ecd3fcb78f32a664..ba2095b05f8227d5a2ee1d7e7ed5576c09ce04d4 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -25,9 +26,10 @@ import android.content.Context; import android.content.DialogInterface; import android.content.pm.UserInfo; import android.os.UserManager; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index 6247feb16bac315337212d475c483198be08a93f..c20866e186fe7391acfbdcb2add7f86b636ed347 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.when; @@ -24,6 +25,7 @@ import android.app.Fragment; import android.content.Context; import android.content.pm.UserInfo; import android.os.UserManager; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java index 176d1b0492cc025dda737312934c52f2c6bad56c..85a5e34ca3e8922e97486e55a002713972d822f8 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncWorkDataPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java index d85f2fa8732ec294e44cadb5f24f97a0736f540d..e07a4ad7d63152423d8b85e8df475c8593bbd5b9 100644 --- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java +++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java index 2eeecaa4d4fdb1babfc4270ca1b9a2f32479a873..abdf4f513ff8c28a936621d9e1b9a4bb134e3a23 100644 --- a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java index ef8fae65344e08ee39c8847319e02d1d6c0c6ba3..ed79cf22ea9b84790a3e9eceddf0d74ae8207e8a 100644 --- a/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/users/UserPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java index a7fe91677ea62a6dd583cdb16ff796b662da4161..6f5b404b843e789a7d5dee1d0570ee1149c56918 100644 --- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.users; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java index fd41c3682ee6d5650ae051662d841618aa983b1d..f8c08eaf27ef6f0bc89e3ed087db20aa03cf09e1 100644 --- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java @@ -17,6 +17,7 @@ package com.android.settings.vpn2; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index fc708eff63bfe67997b00f0040d7512e3c5336f2..9ae0e549477558fc4fbd8817759b2d90d0b90c36 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java index 82412403c5ae4d4ec2017507bfb33c070414239c..2713e92e02c060dc3954a0dd6435dae968b4dd68 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypeSettingsTest.java @@ -1,6 +1,7 @@ package com.android.settings.wallpaper; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -10,6 +11,7 @@ import static org.robolectric.RuntimeEnvironment.application; import android.app.Activity; import android.content.Intent; + import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index 2a95bc2e95a5bcbf9c6ff1650d907451d5446d58..ee532582de516b33c20e8fba2b6ed210b1392ad5 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -17,7 +17,9 @@ package com.android.settings.webview; import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java index a387d7870e0ea1f57cb449f0c940dbacfdae33e4..3ae29d36bd6d9ade497bad60daecae9c4c98fd23 100644 --- a/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/wfd/WifiDisplaySettingsTest.java @@ -17,6 +17,7 @@ package com.android.settings.wfd; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 6b4df47ea3ffc80915d35457cb70cc3e99dec53c..454813fb14fcce058cb9a566b4f670a5346c8583 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -18,7 +18,9 @@ package com.android.settings.widget; import static androidx.lifecycle.Lifecycle.Event.ON_START; import static androidx.lifecycle.Lifecycle.Event.ON_STOP; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,9 +28,10 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; +import android.view.View; + import androidx.lifecycle.LifecycleOwner; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index f34c60baa93248538c5593597f2edc2e96815dfc..a66f6d55ca08866c41b215af9c6656a63a3bc6eb 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -24,10 +25,11 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.Button; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index 9ce63179ccfbf83fa88f2d6251d0b430ab912ea2..c75d8fd463f0c0ba450c7d54ae0a7afeb760863a 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -19,9 +19,10 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index 6cb4f3d023425315d457dfcb2f73fe8aff18eb09..ce366fe78de227018fb7b2f51988a0e68c708953 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -19,9 +19,10 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index 90470f64a1dfd0e88ff2103a46605050af18e257..02add358f97062bc8950ff2ab6c28242290b1254 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -27,6 +27,11 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.view.LayoutInflater; import android.view.View; +import android.widget.LinearLayout; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,11 +40,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import androidx.preference.R; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; -import android.widget.LinearLayout; - @RunWith(SettingsRobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 3337bd4f8b5c86bf283e17b5eba5b380a35a59b8..0300b71bfd6fc0270d167be1ec14ffb77e4ba2c3 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -36,13 +37,14 @@ import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.graphics.drawable.ColorDrawable; import android.os.UserHandle; -import androidx.preference.Preference; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 48e918d9de07571898c7583a547a391dd4cfe75a..3cbbbbec7d5d4dd8c817894d8b23efe22ce83304 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -20,12 +20,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index d952324a3033a1cf6bc1f1a2c19b79a3284a6c07..79f344d92205df4a8839de14f6f341b1d9b60ff8 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; @@ -29,11 +30,12 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; +import android.view.View; + import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceViewHolder; import androidx.recyclerview.widget.RecyclerView; -import android.view.View; import com.android.settings.R; import com.android.settings.SettingsActivity; diff --git a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java index 0ffda3baa969fccda1db856dfecc7c5398481d3e..ed97e55a4bf46413b2d1f50bb12ec04223f40cb8 100644 --- a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java @@ -31,26 +31,21 @@ import static org.mockito.Mockito.when; import android.app.AlertDialog; import android.content.Context; import android.net.wifi.WifiConfiguration; -import android.os.Bundle; import android.os.Parcelable; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; -import android.widget.CheckBox; import android.widget.LinearLayout; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; -import java.util.List; - @RunWith(SettingsRobolectricTestRunner.class) public class HotspotApBandSelectionPreferenceTest { private HotspotApBandSelectionPreference mPreference; diff --git a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java index 37d055e4576e39b173c125a7a31786da6d9fec0c..07a0aa97ba10410c115fa1271da3b35ea519c007 100644 --- a/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/LoadingViewControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.mock; diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index b21090dacc9afcab42b8ae591bdfd24d1fc804fc..e5cff2172a18c270d64760622f1440c0d446c33c 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -17,17 +17,19 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.CheckBox; import android.widget.LinearLayout; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index f96519a4a1bb89552554f0f62f076e2ecc214d2d..04b30892558f66846b0bc74b4761bec13ca42bfb 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -17,17 +17,19 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.Switch; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java index 5895db25a701ea3b71ca0941f592cf0c0e8c2d38..92f75e99e3e7c2ade98ff5707bdbcd1d68b5073f 100644 --- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 29cc1796930e5c080f560336e77f6acc2fb98c19..64352d966388fbd36d1e1492ecebb076a8758a21 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,6 +26,7 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.UserManager; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 80af1f92bff90585644d96e62ff8e91181258efd..5d914a2f2737bd8548258e25bff60acea3b08dfd 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -17,15 +17,17 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static junit.framework.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.Application; -import androidx.preference.PreferenceViewHolder; import android.view.View; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index f7c96ed559088145943556160addefe0e3cf8a1b..7edfd0be636c54ddfc341212e12ecff87463a70a 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -19,11 +19,12 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; import android.os.Parcelable; -import androidx.viewpager.widget.PagerAdapter; import android.text.TextUtils; import android.view.View; import android.view.ViewGroup; +import androidx.viewpager.widget.PagerAdapter; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; diff --git a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java index 77e18acae41454a8a01b96a0ee79f08ff62c6c6d..cafff056868bf1a93000c0347077d1904fa165c6 100644 --- a/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java +++ b/tests/robotests/src/com/android/settings/widget/ScrollToParentEditTextTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.eq; diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index 818daecd26d8ba494669aff5877aaff3fca6b7a1..ebfe74c358113f69759f348e0e248348cc1efc0e 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.robolectric.RuntimeEnvironment.application; import android.content.Context; @@ -25,8 +26,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; - import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java index c88e7f87d00f675bc22f93f3d165c000a3234f1c..e1c500211ea8e532c604f0ac75e514ddf7b40674 100644 --- a/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/TwoStateButtonPreferenceTest.java @@ -17,6 +17,7 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index c55ee9f56a9b79ecdae0e5f713ad6f388e146b43..ae55217b6990d163244ee8929b89c0470b9e6b53 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -18,9 +18,13 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; + import android.content.Context; -import androidx.preference.ListPreference; import android.widget.ArrayAdapter; + +import androidx.preference.ListPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; @@ -34,8 +38,6 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; -import static org.mockito.Mockito.spy; - @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) public class UpdatableListPreferenceDialogFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 4e2ec7b2af1eb3955e8b79ed976755f1d54cab62..ca7fab5ee51d57dc45fc1e54034d9639ce97a79a 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -25,13 +25,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.preference.PreferenceViewHolder; import android.text.InputType; import android.text.TextWatcher; import android.view.View; import android.widget.EditText; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -40,7 +41,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; @RunWith(SettingsRobolectricTestRunner.class) public class ValidatedEditTextPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java index a2f859c6321b61a71f592b7e98049c4af4a7f95f..57f0679dbc8e4fbb03ce494c52d5838b3db559f9 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -22,9 +22,10 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.media.MediaPlayer; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index d49c019aeb66e15c6d90cc0f4f63cc2fcbb068c0..b65e5aefc0b7e8d1ee3033e8c53caba8fcc75f1f 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -16,10 +16,11 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; -import android.content.pm.PackageInfo; import android.Manifest; +import android.content.pm.PackageInfo; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.applications.ApplicationsState.AppEntry; diff --git a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java index eb58452c60e4cf117b54fd997dfa5aefb08752c1..e12053cd4acde260ec83658fd1e98afbe29b0b7d 100644 --- a/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/CellularFallbackPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java index 012a76386de8ec1bc845761151fa39d1acb5230e..6d8996068e4c003fd2999a6c3b879a68d0954b04 100644 --- a/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ChangeWifiStateDetailsTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index a0befc0e2de4d62e1deb5e149cf8c48c51cc8da5..be8eeae93d54b760718e6de7202920bdcb8850b8 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -1,6 +1,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 5ec598a4a79e2138a10b34d884c54bfa2ae4302d..94f10ddd88bca674a21066886ef5b90900b82d4d 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -19,12 +19,13 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.LinkifyUtils; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index de629d83eccad08bd278bb7abe0e7e78088d322f..c9be0f6324e1451c43e06895d0e4bff626e74289 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -17,14 +17,17 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index bc99fc24acf1dec5b3a89c158209b8ba15f89aef..84297919b4efd903e230a628454879eb9265160a 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -18,9 +18,12 @@ package com.android.settings.wifi; import static android.content.Context.NETWORK_SCORE_SERVICE; import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE; + import static com.android.settings.wifi.UseOpenWifiPreferenceController .REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -35,8 +38,9 @@ import android.content.Intent; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java index 43e87d83050cf60e2a040d0a5c884ee42c95bfd5..5e8dd28ba1ff5542a90caaf5a1400f016f2e7962 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.anyInt; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java index 8cdecff0258229eae5046dc55be28cfb8d8e2bd6..a6a13b30f1b0418e9578a6ce23d831425b271a33 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import android.content.Intent; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 75c9bb14a5e045bc3d225db406d0b17320ba09a9..71a729815136bf1a6117737dfa0dd3e64d32f8ac 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -19,7 +19,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java index 19565f39bfcba0ecfe62873461efafe96283b2f9..d16647f320730708eddb9530273f634ccacd8095 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -18,19 +18,22 @@ package com.android.settings.wifi; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 57ecfd0c37ef3735faf4d996766b3c37fdf162af..06d347940790bd1b4fcac4cbd7c2e4b189ed773b 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -31,6 +31,7 @@ import android.net.NetworkRequest; import android.net.NetworkScoreManager; import android.net.wifi.WifiManager; import android.os.Handler; + import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index ed312f4de70260884e3d2f6ab971e6af5af29885..610874a7a377dd5e8feb9475322d5d0ef93bd42b 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.spy; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java index 0cd6bee16cfa35b1cf46c74c5ed0f35aeae43e59..7b95a46a8458a51c9d72ae0b73d77a8194974c25 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java @@ -24,15 +24,21 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; - -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.testutils.SliceTester; - import android.content.Intent; import android.content.res.Resources; import android.net.wifi.WifiManager; + import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.widget.SliceLiveData; + +import com.android.settings.R; +import com.android.settings.testutils.SettingsRobolectricTestRunner; +import com.android.settings.testutils.SliceTester; import org.junit.Before; import org.junit.Test; @@ -41,13 +47,6 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.widget.SliceLiveData; - @RunWith(SettingsRobolectricTestRunner.class) public class WifiSliceBuilderTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java index f55c57f865807ff285fba16d93562aea7ebe052a..d40ead143be49d4b1322d5376ee72168df6b7acd 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSummaryUpdaterTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 38118f58586067604a939ffc5e7eaef8b79bc147..ffe1d8fe84d3ce885ad7f448e8d22c123b33ad2d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -18,18 +18,19 @@ package com.android.settings.wifi; import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE; import static android.provider.Settings.Global.WIFI_WAKEUP_ENABLED; + import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import android.app.Fragment; import android.content.Context; import android.location.LocationManager; import android.provider.Settings; -import androidx.preference.SwitchPreference; + import androidx.preference.Preference; +import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; diff --git a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java index 170cf53c1c331ec327df04ce288a7faa086399ba..a322dc2ab2d23e5def5ec8b10fd9680407fd0a07 100644 --- a/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WriteWifiConfigToNfcDialogTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.when; import android.app.Activity; diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index 21f6daa342847d80e920326f49b232f76a7e47e4..ea8fd00d594b1450169e7454e110c6934b267df6 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -26,7 +26,6 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.content.Context; @@ -47,7 +46,6 @@ import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; -import com.android.settings.slices.SliceBuilderUtils; import com.android.settings.slices.SliceData; import com.android.settings.slices.SlicesFeatureProvider; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 435882b1790b5c106f2ae583c3b2be1e2449190e..8b5c67f6a977dde1031060c9423ce0ea1c820e17 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; @@ -30,7 +31,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -51,12 +51,14 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Handler; import android.provider.Settings; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java index 13dc51dcd690e0db829ea86e5b03718ecd6a3111..dd5dcc9a7b71ead474e02395ee142b76218937ca 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -16,11 +16,13 @@ package com.android.settings.wifi.details; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; import android.net.wifi.WifiConfiguration; + import androidx.preference.DropDownPreference; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java index 41b70e2674c600b73fd62a272d1fe316557a39b6..8921311b7609e9d61b61cb38fb332e5f51857763 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.never; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java index 9741f4fd7351044783d95801100b8e68c7e032f4..849c35acc8862eae991a186e5b3d8f1bf38288d8 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -17,10 +17,12 @@ package com.android.settings.wifi.p2p; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; + import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index fb4ffc354e2ff8eebe61bae0cc8e3f642141a126..75c5ffc26911cf62258abcf1c2b9546d1b64f36b 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -17,19 +17,22 @@ package com.android.settings.wifi.p2p; import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE; import static androidx.lifecycle.Lifecycle.Event.ON_RESUME; + import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.wifi.WifiManager; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java index b6bf7e798dafd0a578361416cdb6028a14a9bbfd..fb7bef183ad168fc352c4a98f7fe04677c604733 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/TetherServiceTest.java @@ -16,6 +16,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index 4b81b345001b048fb6f589a5db8a53f1b3fb40d9..e1e872dacb77966ea05d047a57345a6c3de6a4fa 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.PreferenceScreen; import com.android.settings.R; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java index 06373539f2e27f555a96fa1b89b952451e3f97cb..519aa54e4a5b4756fbbeb8c8eb8de7c8ae8d2f12 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; + import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index a790d52aa854f5ab9c0fa0711c6553e5f1f2ea69..1b063d0ff86d8a2264961dbac3fefb10d112fe76 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index 9df86b879b39b49ed69e6770720af315ea3524d9..c81c490ed127bf9842eb5af34fabbe52ac45a78b 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -16,27 +16,23 @@ package com.android.settings.wifi.tether; -import static androidx.lifecycle.Lifecycle.Event.ON_START; -import static androidx.lifecycle.Lifecycle.Event.ON_STOP; import static com.google.common.truth.Truth.assertThat; -import static org.mockito.Matchers.any; + import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.lifecycle.LifecycleOwner; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; + +import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java index bbd57cba34bc1e6d48cdb4287ac2a6c3d59b2135..a9d4a43c4fe25eee648048e861609cbae518b7e7 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -26,6 +27,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java index 86f03e0fdf4694271e1032cee5b3e2cbc5955ca8..f8131850fe30951cab3160230fe46b7da4150f0c 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -10,6 +10,7 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; + import androidx.preference.ListPreference; import androidx.preference.PreferenceScreen; @@ -18,7 +19,6 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java index f5ac697fcf8be9f6b29c55cb1a999bc489e024c8..d22776f647f190a97d4ef684d81d3bfea68d4d09 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy;