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/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java index 47027d78209ff26aa05d0c9e12fd815c3f1e5cfe..4bcf656ec42de98186b1f5e15155b70962c7bbc3 100644 --- a/src/com/android/settings/CredentialStorage.java +++ b/src/com/android/settings/CredentialStorage.java @@ -38,14 +38,17 @@ import android.security.KeyStore; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; + import com.android.internal.widget.LockPatternUtils; import com.android.org.bouncycastle.asn1.ASN1InputStream; import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.security.ConfigureKeyGuardDialog; import com.android.settings.vpn2.VpnUtils; + import java.io.ByteArrayInputStream; import java.io.IOException; + import sun.security.util.ObjectIdentifier; import sun.security.x509.AlgorithmId; diff --git a/src/com/android/settings/CustomListPreference.java b/src/com/android/settings/CustomListPreference.java index cb87440f7a65b4a30f7520695eb197878028a8d8..c66638089744ef57f73377f08a5095b93de5c89b 100644 --- a/src/com/android/settings/CustomListPreference.java +++ b/src/com/android/settings/CustomListPreference.java @@ -25,13 +25,14 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.preference.ListPreference; +import androidx.preference.ListPreferenceDialogFragment; + public class CustomListPreference extends ListPreference { public CustomListPreference(Context context, AttributeSet attrs) { diff --git a/src/com/android/settings/FallbackHome.java b/src/com/android/settings/FallbackHome.java index 84a3283b7383ce3d3f63f808ddce2d8843dbb832..7d5948eaa3aaf13ac0688220c322a2c66f032236 100644 --- a/src/com/android/settings/FallbackHome.java +++ b/src/com/android/settings/FallbackHome.java @@ -17,26 +17,23 @@ package com.android.settings; import android.app.Activity; -import android.app.ProgressDialog; import android.app.WallpaperColors; import android.app.WallpaperManager; 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..c161d9dc9bfda59866b54f8932ec4d6f6fb53672 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,11 +41,15 @@ import android.widget.TabHost.TabContentFactory; import android.widget.TabHost.TabSpec; import android.widget.TabWidget; import android.widget.Toast; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneFactory; import com.android.internal.telephony.TelephonyIntents; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Implements the preference screen to enable/disable ICC lock and * also the dialogs to change the ICC PIN. In the former case, enabling/disabling diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java index ba3c4d912dd5b41eda5ade569933247b77fae8c8..2983dba7fca474912bd6a61cf2de7873da8974ea 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; @@ -64,6 +63,8 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Confirm and execute a reset of the device to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/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..2873881c900036bd77f95bcba05dac0aa65d8916 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; @@ -33,6 +31,9 @@ import android.widget.TextView; import com.android.settings.widget.DotsPageIndicator; import com.android.settings.widget.LabeledSeekBar; +import androidx.viewpager.widget.ViewPager; +import androidx.viewpager.widget.ViewPager.OnPageChangeListener; + /** * Preference fragment shows a preview and a seek bar to adjust a specific settings. */ 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..2b47c86b73d685fd0dc8dfd9bacee62002640cd9 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -25,7 +25,6 @@ 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; @@ -34,6 +33,8 @@ import android.widget.TextView; import java.util.Locale; +import androidx.annotation.VisibleForTesting; + /** * {@link Activity} that displays regulatory information for the "Regulatory information" * preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature, diff --git a/src/com/android/settings/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 87c487d566f91921183ff986af200f0712c6f0af..1ecc8d78747bface8c99d4a45ae4a6c7883df471 100644 --- a/src/com/android/settings/ResetNetworkConfirm.java +++ b/src/com/android/settings/ResetNetworkConfirm.java @@ -33,10 +33,8 @@ 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; @@ -51,6 +49,8 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settings.network.ApnSettings; import com.android.settingslib.RestrictedLockUtils; +import androidx.annotation.VisibleForTesting; + /** * Confirm and execute a reset of the network settings to a clean "just out of the box" * state. Multiple confirmations are required: first, a general "are you sure diff --git a/src/com/android/settings/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..4ea38b913b72fbb1638edad16dc10c462aea8f30 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,14 +35,14 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.ListView; -import com.android.settings.Utils; 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; +import androidx.preference.ListPreferenceDialogFragment; +import androidx.preference.PreferenceViewHolder; public class RestrictedListPreference extends CustomListPreference { private final RestrictedPreferenceHelper mHelper; 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..3bf9f85fdcce7bd8b93e2e90e14331b4b38da0aa 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,7 +29,6 @@ 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; @@ -35,7 +36,7 @@ import com.android.settings.dashboard.RestrictedDashboardFragment; import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper; import com.android.settingslib.RestrictedLockUtils; -import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import androidx.annotation.VisibleForTesting; /** * Base class for settings screens that should be pin protected when in restricted mode or 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 8b9b912e88d9db480c1ca32e5461be8254d7a67e..3794d0eb6a52b6bb14dd6fa7beccfe6dabf6bf87 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -39,14 +39,8 @@ 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; import android.util.Log; import android.view.View; import android.view.View.OnClickListener; @@ -58,7 +52,6 @@ import com.android.internal.util.ArrayUtils; import com.android.settings.Settings.WifiSettingsActivity; import com.android.settings.applications.manageapplications.ManageApplications; import com.android.settings.backup.BackupSettingsActivity; -import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.gateway.SettingsGateway; import com.android.settings.dashboard.DashboardFeatureProvider; @@ -77,6 +70,12 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; + public class SettingsActivity extends SettingsDrawerActivity implements PreferenceManager.OnPreferenceTreeClickListener, PreferenceFragment.OnPreferenceStartFragmentCallback, diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java index 7272399247f3b46e544d4604020e5b5407fa529a..b4b6d73199131d577b2f7e0d353c0448a2cfa7a5 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,18 +32,14 @@ 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 com.android.settings.shortcut.CreateShortcut; + 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 com.android.settings.shortcut.CreateShortcut; +import androidx.annotation.VisibleForTesting; /** * Listens to {@link Intent.ACTION_PRE_BOOT_COMPLETED} and {@link Intent.ACTION_USER_INITIALIZED} diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java index c1489b033724db517d097994c727506265fe2395..d64bcb3718fb337b8df3c11ab87e210b237e8828 100644 --- a/src/com/android/settings/SettingsLicenseActivity.java +++ b/src/com/android/settings/SettingsLicenseActivity.java @@ -25,8 +25,6 @@ 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; @@ -36,6 +34,9 @@ import com.android.settingslib.license.LicenseHtmlLoader; import java.io.File; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.FileProvider; + /** * The "dialog" that shows from "License" in the Settings app. */ diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index e5a4892044ff5bb684464daa0f057d07e4ee6bed..5a5db454b5614b0f2a509b189aa03265017b8357 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; @@ -56,6 +49,14 @@ import com.android.settingslib.widget.FooterPreferenceMixin; import java.util.UUID; +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; + /** * Base class for Settings fragments, with some helper functions and dialog management. */ 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..60ad1ed571056c929e62759ddca888109d7850cb 100644 --- a/src/com/android/settings/SetupWizardUtils.java +++ b/src/com/android/settings/SetupWizardUtils.java @@ -18,10 +18,11 @@ package com.android.settings; import android.content.Intent; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; import com.android.setupwizardlib.util.WizardManagerHelper; +import androidx.annotation.VisibleForTesting; + public class SetupWizardUtils { @VisibleForTesting 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..acfe89fff066190d309194bc844fdb1ccc371691 100644 --- a/src/com/android/settings/TestingSettings.java +++ b/src/com/android/settings/TestingSettings.java @@ -18,10 +18,11 @@ package com.android.settings; import android.os.Bundle; import android.os.UserManager; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; +import androidx.preference.PreferenceScreen; + public class TestingSettings extends SettingsPreferenceFragment { @Override 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 0be2cfd5e78a21f35d0d5aee8d1219495803a87e..b703e4df58b4d245cf1c1969a5e07ad34b15bde0 100644 --- a/src/com/android/settings/TetherSettings.java +++ b/src/com/android/settings/TetherSettings.java @@ -35,9 +35,6 @@ import android.os.Environment; import android.os.Handler; import android.os.UserManager; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.datausage.DataSaverBackend; @@ -53,6 +50,10 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /* * Displays preferences for Tethering. */ diff --git a/src/com/android/settings/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..0342651d332cb8181f3db69d9f733646ad46f5c0 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; @@ -52,6 +51,7 @@ 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; @@ -59,6 +59,8 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; +import androidx.recyclerview.widget.RecyclerView; + public class UserCredentialsSettings extends SettingsPreferenceFragment implements View.OnClickListener { private static final String TAG = "UserCredentialsSettings"; diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java index 938f5b7b31641904d7374daf4616c728e0407414..2a1d8c4839d61e6bed778c73748421a506e654e2 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; @@ -100,6 +97,10 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + public final class Utils extends com.android.settingslib.Utils { private static final String TAG = "Settings"; diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java index 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 764792468d8320a49a2e350ed5b547a1241dba5d..3464fd976adf7a182af5957bd97b7fc66e5cbab7 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettings.java +++ b/src/com/android/settings/accessibility/AccessibilitySettings.java @@ -33,13 +33,6 @@ import android.os.UserHandle; import android.os.Vibrator; import android.provider.SearchIndexableResource; import android.provider.Settings; -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; @@ -69,6 +62,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.ContextCompat; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * Activity with the accessibility settings. */ diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java index 3500ba29d5e1e5d4f837c0a951d6f6e37805795a..e6f7a9ad36640ef71ef2f7dea4ed97dbaf27b52c 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizard.java @@ -21,7 +21,6 @@ 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; @@ -31,6 +30,8 @@ import com.android.settings.SettingsPreferenceFragment; import java.util.List; +import androidx.preference.Preference; + /** * Activity with the accessibility settings specific to Setup Wizard. */ diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java index 37b1018ffe47fdf7e64edf4826e4273e6697001f..95a566c22a7bc43f032b64ddf91efe32429b4174 100644 --- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java +++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java @@ -17,8 +17,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.search.actionbar.SearchMenuController; import com.android.settings.support.actionbar.HelpResourceProvider; import com.android.settingslib.core.instrumentation.Instrumentable; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity { private static final String SAVE_KEY_TITLE = "activity_title"; diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 396ddcc6d0bb33140fb0a62b5f2330b86a644acc..1b773bb70fc0b97992b12a346c7aa4b3b7485f45 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -25,8 +25,6 @@ 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; @@ -38,6 +36,9 @@ import com.android.settings.search.Indexable; import com.android.settingslib.accessibility.AccessibilityUtils; import com.android.settingslib.search.SearchIndexable; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Settings page for accessibility shortcut */ diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java index a5e02c5cc57f17c1db8faf514b8c0180a08df05f..b1e5ece8489fc28d1ed6c77513d452499fce11ce 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; @@ -48,6 +44,11 @@ import com.android.settingslib.accessibility.AccessibilityUtils; import java.util.Locale; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; + /** * Settings fragment containing captioning properties. */ diff --git a/src/com/android/settings/accessibility/ColorPreference.java b/src/com/android/settings/accessibility/ColorPreference.java index 7a7b7fc645707524c53e12dc1e4767e2a66b2086..810f809966421fd47d648f3c679e6836d73dd808 100644 --- a/src/com/android/settings/accessibility/ColorPreference.java +++ b/src/com/android/settings/accessibility/ColorPreference.java @@ -20,7 +20,6 @@ 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; @@ -29,6 +28,8 @@ import android.widget.TextView; import com.android.settings.R; +import androidx.preference.PreferenceViewHolder; + /** * Grid preference that allows the user to pick a color from a predefined set of * colors. Optionally shows a preview in the preference item. diff --git a/src/com/android/settings/accessibility/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..145af9db65ca772ab13fa5d2bae27817815802b6 100644 --- a/src/com/android/settings/accessibility/LocalePreference.java +++ b/src/com/android/settings/accessibility/LocalePreference.java @@ -17,7 +17,6 @@ package com.android.settings.accessibility; import android.content.Context; -import androidx.preference.ListPreference; import android.util.AttributeSet; import com.android.internal.app.LocalePicker; @@ -25,6 +24,8 @@ import com.android.settings.R; import java.util.List; +import androidx.preference.ListPreference; + /** * List preference that allows the user to pick a locale from the list of * supported device locales. diff --git a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java index f613c69e1b5d057447c07e7f8b06e98abc04a3cb..9ffdf8cdea4e543fbde2d69306012661056a19c2 100644 --- a/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationGesturesPreferenceController.java @@ -18,11 +18,11 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; +import androidx.preference.Preference; + public class MagnificationGesturesPreferenceController extends TogglePreferenceController { private boolean mIsFromSUW = false; diff --git a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java index 5af5d9305611f339a30db10c005fc90a5a5b9d72..a2962d4a9bc8d2d0e8073f1b9e259e6d906746d4 100644 --- a/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java +++ b/src/com/android/settings/accessibility/MagnificationNavbarPreferenceController.java @@ -18,11 +18,11 @@ import android.os.Bundle; import android.provider.Settings; import android.text.TextUtils; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.TogglePreferenceController; +import androidx.preference.Preference; + public class MagnificationNavbarPreferenceController extends TogglePreferenceController { private boolean mIsFromSUW = false; diff --git a/src/com/android/settings/accessibility/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 33e39d2d997233e972f350477dbaebe1c4f1aaee..eacc68f8ec36021d82179e1a08c23e1e8f8e10a9 100644 --- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java +++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java @@ -16,8 +16,10 @@ 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 +41,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..15857b324e1147c9bd8505e5aff91026d15719fb 100644 --- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java @@ -19,7 +19,6 @@ 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; @@ -28,6 +27,8 @@ import com.android.settings.R; import com.android.settings.widget.SeekBarPreference; import com.android.settings.widget.SwitchBar; +import androidx.preference.Preference; + /** * Fragment for preference screen for settings related to Automatically click after mouse stops * feature. diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java index a38fd275377506b766c69bfd522779f671fe9795..2885ee64837dbfa6ea0b52719c5857487bdae71f 100644 --- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java @@ -18,8 +18,6 @@ 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; @@ -27,6 +25,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.widget.SwitchBar; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener { private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED; diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 94a26b9d5a89870298bd52e790facbfa1ad5d17f..a466c2f63faf136e90d769d04003cf490d9c2bbc 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -19,8 +19,6 @@ package com.android.settings.accessibility; import android.content.Intent; import android.content.pm.ResolveInfo; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.view.View; import com.android.settings.R; @@ -29,6 +27,9 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class ToggleFeaturePreferenceFragment extends SettingsPreferenceFragment { protected SwitchBar mSwitchBar; diff --git a/src/com/android/settings/accessibility/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/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..789e28fd654aa3b1b9efc237578cbc387d078d24 100644 --- a/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java @@ -23,8 +23,6 @@ import android.os.Handler; import android.os.Looper; import android.os.Vibrator; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -32,6 +30,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class VibrationIntensityPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/accessibility/VibrationPreferenceFragment.java b/src/com/android/settings/accessibility/VibrationPreferenceFragment.java index 99557836aa084ed222fd99d238b50c2434d88983..288b5fa53ff1e22b0549532ed0fc9f0236846584 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,6 @@ 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 com.android.settings.R; import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settingslib.widget.CandidateInfo; @@ -41,6 +38,8 @@ import java.util.Comparator; import java.util.List; import java.util.Map; +import androidx.annotation.VisibleForTesting; + /** * Fragment for changing vibration settings. */ diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index 241f1f3e043aa6971337756612b059f7f8344cd0..56d8763add1bfdebc090e605052f8a1048e7ae49 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -21,8 +21,6 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -35,6 +33,9 @@ import com.android.settingslib.drawer.Tile; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + public class AccountDetailDashboardFragment extends DashboardFragment { private static final String TAG = "AccountDetailDashboard"; diff --git a/src/com/android/settings/accounts/AccountFeatureProvider.java b/src/com/android/settings/accounts/AccountFeatureProvider.java index 2b351a86189d3ed0f7469a535c52ebd15fb2a62f..9829ca64b4ce4594ef670a7b8b686d5aeeed8713 100644 --- a/src/com/android/settings/accounts/AccountFeatureProvider.java +++ b/src/com/android/settings/accounts/AccountFeatureProvider.java @@ -18,9 +18,6 @@ package com.android.settings.accounts; import android.accounts.Account; import android.content.Context; -import android.util.FeatureFlagUtils; - -import com.android.settings.core.FeatureFlags; public interface AccountFeatureProvider { String getAccountType(); diff --git a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java index 78713469c0bea693b7f4f68952df6e6a69591f2a..7866cc7e3dd3569da3be13e6f1606dee7fb58e2f 100644 --- a/src/com/android/settings/accounts/AccountHeaderPreferenceController.java +++ b/src/com/android/settings/accounts/AccountHeaderPreferenceController.java @@ -24,8 +24,6 @@ import android.app.Activity; import android.content.Context; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; @@ -37,6 +35,9 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + public class AccountHeaderPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume { diff --git a/src/com/android/settings/accounts/AccountPreference.java b/src/com/android/settings/accounts/AccountPreference.java index ad7a4b380e4a9ded9151c2ec9ca3a079aca9bb16..950b987489485df42b18c23e808d4a8b7aa7af83 100644 --- a/src/com/android/settings/accounts/AccountPreference.java +++ b/src/com/android/settings/accounts/AccountPreference.java @@ -19,8 +19,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.R; import java.util.ArrayList; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * AccountPreference is used to display a username, status and provider icon for an account on * the device. diff --git a/src/com/android/settings/accounts/AccountPreferenceController.java b/src/com/android/settings/accounts/AccountPreferenceController.java index 7cfc6574aaf9599ff790924a5dff6db9a2468cbe..e44b4606b32e0351f15fa12d510a63a6b927d079 100644 --- a/src/com/android/settings/accounts/AccountPreferenceController.java +++ b/src/com/android/settings/accounts/AccountPreferenceController.java @@ -36,10 +36,6 @@ 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; @@ -67,6 +63,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + public class AccountPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener, OnPreferenceClickListener, LifecycleObserver, OnPause, OnResume { diff --git a/src/com/android/settings/accounts/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 22855fc733a6f09fb10fd5a15999bfee5aadf26b..3ed19d2cecd7a4b20f95e48d27f1058887bb6c50 100644 --- a/src/com/android/settings/accounts/AccountSyncPreferenceController.java +++ b/src/com/android/settings/accounts/AccountSyncPreferenceController.java @@ -24,9 +24,6 @@ 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; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -35,6 +32,10 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class AccountSyncPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, AuthenticatorHelper.OnAccountsUpdateListener { diff --git a/src/com/android/settings/accounts/AccountTypePreference.java b/src/com/android/settings/accounts/AccountTypePreference.java index 1a4c57df6a6f75eaed444faac47f744a4bfd68b6..81bf2e44a7f9bc06b3f7bbd4d15134ce5fcceaa3 100644 --- a/src/com/android/settings/accounts/AccountTypePreference.java +++ b/src/com/android/settings/accounts/AccountTypePreference.java @@ -24,13 +24,14 @@ 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 com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.widget.AppPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; + public class AccountTypePreference extends AppPreference implements OnPreferenceClickListener { /** * Title of the tile that is shown to the user. diff --git a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java index dd0eaddbf4b41fb281797c3644b8cacb46b354ee..d051279bcf417adc06434ebaca182f1c22a6228d 100644 --- a/src/com/android/settings/accounts/AccountTypePreferenceLoader.java +++ b/src/com/android/settings/accounts/AccountTypePreferenceLoader.java @@ -29,11 +29,6 @@ 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 androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; @@ -44,6 +39,12 @@ import com.android.settings.utils.LocalClassLoaderContextThemeWrapper; import com.android.settingslib.accounts.AuthenticatorHelper; import com.android.settingslib.core.instrumentation.Instrumentable; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Class to load the preference screen to be added to the settings page for the specific account * type as specified in the account-authenticator. diff --git a/src/com/android/settings/accounts/ContactSearchPreferenceController.java b/src/com/android/settings/accounts/ContactSearchPreferenceController.java index de6e43ba26198c37d74794b70533f6c72c1aa768..adfa7e11fd748180583b7891ed529e40c238f310 100644 --- a/src/com/android/settings/accounts/ContactSearchPreferenceController.java +++ b/src/com/android/settings/accounts/ContactSearchPreferenceController.java @@ -18,13 +18,14 @@ import static android.provider.Settings.Secure.MANAGED_PROFILE_CONTACT_REMOTE_SE import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.slices.SliceData; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; +import androidx.preference.Preference; + public class ContactSearchPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java index 95bc8e7d3cc258fea73314a0f42757e21ec76f69..a24a04e4e8daac760386da6054ec75564ede9e24 100644 --- a/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java +++ b/src/com/android/settings/accounts/EmergencyInfoPreferenceController.java @@ -22,7 +22,6 @@ 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; import com.android.settings.core.PreferenceControllerMixin; @@ -31,6 +30,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.preference.Preference; + public class EmergencyInfoPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java index ecb849bb8acb3eeca69e8fdc56e6dc4f2f1b886d..11094e6c0471e6866856c3f47caeef8c030cbf03 100644 --- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java +++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java @@ -31,7 +31,6 @@ 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; @@ -47,6 +46,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.io.IOException; +import androidx.preference.PreferenceScreen; + public class RemoveAccountPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, OnClickListener { diff --git a/src/com/android/settings/accounts/SyncStateSwitchPreference.java b/src/com/android/settings/accounts/SyncStateSwitchPreference.java index b65b18381163ce15f424c563dd1577c2169cbd89..17cf6b91c902f38c01cc1a8dd9bdcff39df1d436 100644 --- a/src/com/android/settings/accounts/SyncStateSwitchPreference.java +++ b/src/com/android/settings/accounts/SyncStateSwitchPreference.java @@ -19,8 +19,6 @@ 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; @@ -30,6 +28,9 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settingslib.widget.AnimatedImageView; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + public class SyncStateSwitchPreference extends SwitchPreference { private boolean mIsActive = false; diff --git a/src/com/android/settings/accounts/WorkModePreferenceController.java b/src/com/android/settings/accounts/WorkModePreferenceController.java index 890dd6828acc386f17e8017ea3d6b302b15b0958..fd8a6a9ee7d5cfdb36e889c32683fe26c30599a2 100644 --- a/src/com/android/settings/accounts/WorkModePreferenceController.java +++ b/src/com/android/settings/accounts/WorkModePreferenceController.java @@ -19,10 +19,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.UserHandle; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import android.util.Log; import com.android.settings.R; @@ -32,6 +28,11 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + public class WorkModePreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index dd71087a2a0803454be6df455e9623b83cef1415..9b6b7080784eede935e0f1dbab702a4201fc6870 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -20,13 +20,14 @@ 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 com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; +import androidx.preference.Preference; + public abstract class AppInfoWithHeader extends AppInfoBase { private boolean mCreated; diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java index 7d422b1503071ea487533076b675dfcd4bde6223..6b527a7886ba1c9ed2d84a10483f696fc51d8488 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,9 +31,6 @@ 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; @@ -40,10 +42,9 @@ 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; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java index f8dd59ce8e50949398424e3cf2e15da30ad20aaa..c96197f540a048b845126936a677bfbd9940d1c6 100755 --- a/src/com/android/settings/applications/AppStateAppOpsBridge.java +++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java @@ -25,7 +25,6 @@ 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; @@ -39,6 +38,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.annotation.VisibleForTesting; + /* * Connects app ops info to the ApplicationsState. Makes use of AppOpsManager to * determine further permission level. diff --git a/src/com/android/settings/applications/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..576a0a2a304604d77f4d96472e38c85582c974ba 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,9 +43,6 @@ 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; @@ -72,6 +65,10 @@ import java.util.Map; import java.util.Objects; import java.util.TreeMap; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + public class AppStorageSettings extends AppInfoWithHeader implements OnClickListener, Callbacks, DialogInterface.OnClickListener, LoaderManager.LoaderCallbacks { diff --git a/src/com/android/settings/applications/AppStorageSizesController.java b/src/com/android/settings/applications/AppStorageSizesController.java index 6999a1581e21bfd370bf6c3879f5a4b068a38f22..003197770d32dc3f25c894099f3e8944ef45015e 100644 --- a/src/com/android/settings/applications/AppStorageSizesController.java +++ b/src/com/android/settings/applications/AppStorageSizesController.java @@ -17,14 +17,15 @@ package com.android.settings.applications; import android.content.Context; -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; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.preference.Preference; + /** * Handles setting the sizes for the app info screen. */ diff --git a/src/com/android/settings/applications/ClearDefaultsPreference.java b/src/com/android/settings/applications/ClearDefaultsPreference.java index 26eb0844ce685b4b822938070aec2860a29fd447..76940e5dc903927a738788072bb880da43621563 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; @@ -40,6 +37,10 @@ import com.android.settings.R; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class ClearDefaultsPreference extends Preference { protected static final String TAG = ClearDefaultsPreference.class.getSimpleName(); 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/DirectoryAccessDetails.java b/src/com/android/settings/applications/DirectoryAccessDetails.java index 8a8fa98b6523c547b7e04c08803581e084209a52..970a06d6a16bb04a4450951b1ee5abdaac1abad8 100644 --- a/src/com/android/settings/applications/DirectoryAccessDetails.java +++ b/src/com/android/settings/applications/DirectoryAccessDetails.java @@ -17,17 +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,17 +43,6 @@ 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; @@ -70,6 +60,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * Detailed settings for an app's directory access permissions (A.K.A Scoped Directory Access). * diff --git a/src/com/android/settings/applications/InstalledAppCounter.java b/src/com/android/settings/applications/InstalledAppCounter.java index cba9a947b168cdbfb6e6caa5b3f7a519947a6bde..aeac26e4e75e8302c4416d589b5e0fd2d8b3616e 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 java.util.List; diff --git a/src/com/android/settings/applications/LayoutPreference.java b/src/com/android/settings/applications/LayoutPreference.java index f80100f9d2665bcda8a30ee4a3d44a98aa34d652..393e198d0a27981c0be286a0d7ba8f004b74be3b 100644 --- a/src/com/android/settings/applications/LayoutPreference.java +++ b/src/com/android/settings/applications/LayoutPreference.java @@ -18,10 +18,6 @@ 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; @@ -31,6 +27,11 @@ import android.widget.FrameLayout; import com.android.settings.R; import com.android.settings.Utils; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class LayoutPreference extends Preference { private final View.OnClickListener mClickListener = v -> performClick(v); diff --git a/src/com/android/settings/applications/PremiumSmsAccess.java b/src/com/android/settings/applications/PremiumSmsAccess.java index 2210c0b176b6aec7e4feb04f8576d7d201535c21..ab54c455fdef615ae18d5b0a9bd143a789ae5b16 100644 --- a/src/com/android/settings/applications/PremiumSmsAccess.java +++ b/src/com/android/settings/applications/PremiumSmsAccess.java @@ -18,11 +18,6 @@ import android.annotation.Nullable; import android.app.Application; import android.content.Context; import android.os.Bundle; -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; @@ -41,6 +36,12 @@ import com.android.settingslib.widget.FooterPreference; import java.util.ArrayList; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + public class PremiumSmsAccess extends EmptyTextSettings implements Callback, Callbacks, OnPreferenceChangeListener { private ApplicationsState mApplicationsState; 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..1d5fcd9eda9c6f99113144bb14001c285653bdfc 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; @@ -59,7 +59,8 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import static com.android.settings.widget.EntityHeaderController.ActionType; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; public class ProcessStatsDetail extends SettingsPreferenceFragment { 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 77591bad3ec92db5e662a2241245886e68d7c0a2..03ea490d2a508ab3dfa60d5aa1d24fef418f51f0 100644 --- a/src/com/android/settings/applications/ProcessStatsSummary.java +++ b/src/com/android/settings/applications/ProcessStatsSummary.java @@ -18,8 +18,6 @@ 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; @@ -31,6 +29,9 @@ import com.android.settings.applications.ProcStatsData.MemInfo; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.SummaryLoader; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; + public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenceClickListener { private static final String KEY_STATUS_HEADER = "status_header"; diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java index 42475d295f88180cbb1f487f1d27250b413742e3..774d769cae0c683367de011413b14d28c87b927f 100644 --- a/src/com/android/settings/applications/ProcessStatsUi.java +++ b/src/com/android/settings/applications/ProcessStatsUi.java @@ -19,8 +19,6 @@ 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; @@ -37,6 +35,9 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + public class ProcessStatsUi extends ProcessStatsBase { static final String TAG = "ProcessStatsUi"; static final boolean DEBUG = false; diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java index b24c355ab76999c93966bb1424756d8e4c39d936..57cf8e3610df493751b15b09b597b878e83c6e43 100644 --- a/src/com/android/settings/applications/RecentAppsPreferenceController.java +++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java @@ -27,10 +27,6 @@ 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; @@ -55,6 +51,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** * This controller displays a list of recently used apps and a "See all" button. If there is * no recently used app, "See all" will be displayed as "App info". diff --git a/src/com/android/settings/applications/SpacePreference.java b/src/com/android/settings/applications/SpacePreference.java index b532896f1009116531af1897bceefba35c424580..95343b2acc921378431745cb484588b015169dcf 100644 --- a/src/com/android/settings/applications/SpacePreference.java +++ b/src/com/android/settings/applications/SpacePreference.java @@ -17,13 +17,15 @@ package com.android.settings.applications; import android.content.Context; import android.content.res.TypedArray; -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; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A blank preference that has a specified height by android:layout_height. It can be used * to fine tune screens that combine custom layouts and standard preferences. diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java index ef2b2118d3f8ac374b0a6e098d79d56cbffc2409..16a6cab5d988dfe03090ee3169437aefe6b125b7 100644 --- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java +++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java @@ -14,12 +14,14 @@ 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; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class SpecialAppAccessPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/applications/UsageAccessDetails.java b/src/com/android/settings/applications/UsageAccessDetails.java index 1681b1d31695b52799d8fed06d503d0a956b9f1c..4eb575408ad78ff1f51afdbec4ce54f18c9929a8 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 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; + +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.SwitchPreference; public class UsageAccessDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java index 55a6c9ff4f288b979f640d596f33ea9841e955d7..53c514732b7c208edecacbd00aa4a231193cc46d 100644 --- a/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppBatteryPreferenceController.java @@ -23,9 +23,6 @@ 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; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -45,6 +42,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class AppBatteryPreferenceController extends BasePreferenceController implements LoaderManager.LoaderCallbacks, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java index a32a0d30a69262dd0c795a62ec74eab4b39bde48..f5b5c732cc474c521897099bde610c10b8f0b755 100644 --- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java @@ -37,18 +37,16 @@ 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 com.android.internal.logging.nano.MetricsProto; -import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.Utils; import com.android.settings.applications.ApplicationFeatureProvider; +import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; @@ -66,6 +64,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + /** * Controller to control the uninstall button and forcestop button. All fragments that use * this controller should implement {@link ButtonActionDialogFragment.AppButtonsDialogListener} and diff --git a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java index c572c3724efb2b292f3c835d51c5de281a814c69..3b324e4de13cf58700b30d71ddcb27f14524940b 100644 --- a/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceController.java @@ -25,9 +25,6 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.format.DateUtils; import android.text.format.Formatter; @@ -44,6 +41,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.net.ChartData; import com.android.settingslib.net.ChartDataLoader; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class AppDataUsagePreferenceController extends AppInfoPreferenceControllerBase implements LoaderManager.LoaderCallbacks, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java index e37e6708209c5335d97ddd918b027a019e19516c..7fd8fe58e9827f43091282cb5a8da4cf4bb9ac66 100644 --- a/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java @@ -19,7 +19,6 @@ 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; import com.android.settings.Utils; @@ -32,6 +31,8 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; +import androidx.preference.PreferenceScreen; + public class AppHeaderViewPreferenceController extends BasePreferenceController implements AppInfoDashboardFragment.Callback, LifecycleObserver, OnStart { diff --git a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java index 3fc629d5a574cd1d97ac40506f5dc86d47db513e..ce8dd44934bb9fdcc68cac931e19a89f0fd0cc52 100644 --- a/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBase.java @@ -18,13 +18,14 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.BasePreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /* * Abstract base controller for the app detail preferences that refresh the state when the app state * changes and launch a specific detail fragment when the preference is clicked. diff --git a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java index 6a1079c7a7424e562718dc012e8a3a0db03b82bf..2a8217a27beb6918fa0d9b5b75b63a789d29d1f6 100644 --- a/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceController.java @@ -19,13 +19,14 @@ 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; import com.android.settings.Utils; import com.android.settings.applications.AppStoreUtil; import com.android.settingslib.applications.AppUtils; +import androidx.preference.Preference; + public class AppInstallerInfoPreferenceController extends AppInfoPreferenceControllerBase { private String mPackageName; diff --git a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java index e5b6eed0f59a0a2069f6261c2aa9827822cfe32a..d847d491c983c1cbbb415902c3da33ac1f130f86 100644 --- a/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppMemoryPreferenceController.java @@ -20,8 +20,6 @@ import android.app.Activity; import android.content.Context; import android.content.pm.PackageInfo; import android.os.AsyncTask; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.format.Formatter; import com.android.settings.R; @@ -36,6 +34,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DevelopmentSettingsEnabler; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class AppMemoryPreferenceController extends BasePreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java index e4aaa5465295f9b3150095bb6171489b24d4b5b4..0d34d51c5b5d55efad0b9e1ee778c7b6df1fc163 100644 --- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java @@ -20,7 +20,6 @@ import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -28,6 +27,8 @@ import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; import com.android.settingslib.applications.ApplicationsState; +import androidx.preference.Preference; + public class AppNotificationPreferenceController extends AppInfoPreferenceControllerBase { private String mChannelId = null; diff --git a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java index 7e61385cb7df3abb648fa46c3eafab37d6374401..1901dd247d98d4e515b6955f302c29a15c8d14f8 100644 --- a/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceController.java @@ -22,14 +22,15 @@ 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; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppLaunchSettings; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class AppOpenByDefaultPreferenceController extends AppInfoPreferenceControllerBase { private IUsbManager mUsbManager; diff --git a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java index c5eed7b4ecff35e765efa1366694147328699663..7b14af44a5a0bebb3c3ce38b0d4c80be8f150de4 100644 --- a/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppPermissionPreferenceController.java @@ -21,8 +21,6 @@ import android.content.Context; import android.content.Intent; import android.content.res.Resources; import android.icu.text.ListFormatter; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.util.Log; import com.android.settings.R; @@ -31,6 +29,9 @@ import com.android.settingslib.applications.PermissionsSummaryHelper; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class AppPermissionPreferenceController extends AppInfoPreferenceControllerBase { private static final String TAG = "PermissionPrefControl"; diff --git a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java index 5754dd2030313061ebb633d23d1b36956d716e24..64713bc28671652cdaad034cafd6db1a78d22843 100644 --- a/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java +++ b/src/com/android/settings/applications/appinfo/AppStoragePreferenceController.java @@ -22,8 +22,6 @@ import android.content.Loader; import android.content.pm.ApplicationInfo; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.format.Formatter; import com.android.settings.R; @@ -35,6 +33,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class AppStoragePreferenceController extends AppInfoPreferenceControllerBase implements LoaderManager.LoaderCallbacks, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java index 7198a54ef88831286c7e3183601756a512c85b22..f6e0472a30ed50491d9adfcbcdc9345e3608ce6c 100644 --- a/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/ButtonActionDialogFragment.java @@ -20,8 +20,6 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -30,6 +28,9 @@ import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + /** * Fragment to show the dialog for uninstall or forcestop. This fragment uses function in * target fragment to handle the dialog button click. diff --git a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java index 047de7d5f67f19fa4299b39e624b16183c7a7fd4..2683e1603e435e958d9420323c4956768a9921ea 100644 --- a/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java +++ b/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java @@ -17,7 +17,6 @@ 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 com.android.internal.logging.nano.MetricsProto; @@ -27,6 +26,8 @@ import com.android.settings.applications.DefaultAppSettings; import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; +import androidx.preference.Preference; + /* * Abstract base controller for the default app shortcut preferences that launches the default app * settings with the corresponding default app highlighted. diff --git a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java index 9efa998727b7b546c93bb739ffbd2a4839133e64..6c79a6ecfbb72fa421fa0202d69f8a512f2abdbf 100644 --- a/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java +++ b/src/com/android/settings/applications/appinfo/DrawOverlayDetails.java @@ -19,19 +19,12 @@ 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 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; @@ -45,6 +38,11 @@ import com.android.settings.applications.AppStateOverlayBridge.OverlayState; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.SwitchPreference; + public class DrawOverlayDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java index df8b86298bee1a15f90b506d7a67ccf75d68d9b1..16f0299ae62dc64d91c0f0a2d9fde7004f84661b 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceController.java @@ -19,12 +19,13 @@ 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; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.AppStateInstallAppsBridge; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class ExternalSourceDetailPreferenceController extends AppInfoPreferenceControllerBase { private String mPackageName; diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java index 0c06e081773c6e9e395c08c3930809ca60a3c0e9..dc9ab7e01dae977ccf3b74e4e60d5dbb1453dd12 100644 --- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java +++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java @@ -24,8 +24,6 @@ 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; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -36,6 +34,9 @@ import com.android.settings.applications.AppStateInstallAppsBridge.InstallAppsSt import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + public class ExternalSourcesDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java index d010918cbebba3dd9db7ae785a7fcfa37810cccc..2e668ef46627a4fbc1997a7e985eee5a42e50636 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragment.java @@ -22,6 +22,7 @@ import android.content.DialogInterface; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; + 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/applications/appinfo/InstantAppButtonsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java index 8498669e3489946835f0d072e7901540effbed5b..9c9197ec740b536a7e2cc511ad7002fc9d896904 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceController.java @@ -23,8 +23,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.net.Uri; import android.os.Bundle; - -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; @@ -45,6 +43,8 @@ import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu; import java.util.List; +import androidx.preference.PreferenceScreen; + public class InstantAppButtonsPreferenceController extends BasePreferenceController implements LifecycleObserver, OnCreateOptionsMenu, OnPrepareOptionsMenu, OnOptionsItemSelected { diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java index c0ba33f2d0834dd419428294b9c8325099513f5e..e1025188fdbc044c98b24507bc0b6dab4eabfeff 100644 --- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.applications.appinfo; import android.content.Context; import android.content.pm.PackageManager; -import androidx.preference.Preference; import com.android.settings.Utils; import com.android.settings.applications.AppDomainsPreference; @@ -26,6 +25,8 @@ import com.android.settingslib.applications.AppUtils; import java.util.Set; +import androidx.preference.Preference; + public class InstantAppDomainsPreferenceController extends AppInfoPreferenceControllerBase { private PackageManager mPackageManager; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java index 7b98404e17b4307ede1e9ea9bde9d65aaad90a02..75582cbc157dfdb5b95f7c51ccb7649699d38a41 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceController.java @@ -20,12 +20,13 @@ import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.util.Log; import com.android.settings.SettingsPreferenceFragment; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class PictureInPictureDetailPreferenceController extends AppInfoPreferenceControllerBase { private static final String TAG = "PicInPicDetailControl"; diff --git a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java index 21b224a96ae3537b5920e1eaaeb58aa7c2e88d1d..4f7dd9a83029c678e7a362a0843af0c322acb52c 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureDetails.java @@ -15,13 +15,14 @@ */ 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 com.android.internal.annotations.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -29,9 +30,9 @@ 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; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; 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 974d3f88b0a237537fce4aa81e36b986b02d965d..df961834d9dc034781f62633d2cf7b97457045be 100644 --- a/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java +++ b/src/com/android/settings/applications/appinfo/PictureInPictureSettings.java @@ -27,9 +27,6 @@ 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; @@ -47,6 +44,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + public class PictureInPictureSettings extends EmptyTextSettings { private static final String TAG = PictureInPictureSettings.class.getSimpleName(); diff --git a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java index 6a390770249bde2de5dc5f10c1e2f4a004268bcd..16a1535fe3457c1477390416fbbce72862a0b8fd 100644 --- a/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java +++ b/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceController.java @@ -21,15 +21,16 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class TimeSpentInAppPreferenceController extends BasePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java index 617154797f94895e89d209c05641b3a1711f2a5e..7f9f3599fa442ec2f0320e8fc86d359fd0b77fe1 100644 --- a/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java +++ b/src/com/android/settings/applications/appinfo/WriteSettingsDetails.java @@ -17,19 +17,12 @@ 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 com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -40,6 +33,11 @@ import com.android.settings.applications.AppStateWriteSettingsBridge.WriteSettin import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.SwitchPreference; + public class WriteSettingsDetails extends AppInfoWithHeader implements OnPreferenceChangeListener, OnPreferenceClickListener { diff --git a/src/com/android/settings/applications/appops/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..786fc85f4aed75f432587e19649db17937f35b30 100644 --- a/src/com/android/settings/applications/assist/AssistContextPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistContextPreferenceController.java @@ -20,9 +20,6 @@ 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; import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceControllerMixin; @@ -35,6 +32,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + public class AssistContextPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java index ccdacedc5ac0eddb31ca2d815d2a267a77e0e426..12ce08d5c00f940a555b1680601743e35f9e26ca 100644 --- a/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java @@ -21,9 +21,6 @@ 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; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.app.AssistUtils; @@ -37,6 +34,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + public class AssistFlashScreenPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java index 59425f392e226795c7604017bf51971cb44e9be9..a2a8f289f9b550f43b988d64b227a8d9668f7848 100644 --- a/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java +++ b/src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java @@ -20,9 +20,6 @@ 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; import com.android.internal.app.AssistUtils; import com.android.settings.core.PreferenceControllerMixin; @@ -35,6 +32,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + public class AssistScreenshotPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/assist/AssistSettingObserver.java b/src/com/android/settings/applications/assist/AssistSettingObserver.java index c5d028ec432a91117479986e8b16ecc1105ae15a..917552a7b08ca3b79d12e1f1c5b95ac65b8ac43a 100644 --- a/src/com/android/settings/applications/assist/AssistSettingObserver.java +++ b/src/com/android/settings/applications/assist/AssistSettingObserver.java @@ -20,12 +20,13 @@ 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; import java.util.List; +import androidx.annotation.MainThread; + public abstract class AssistSettingObserver extends ContentObserver { private final Uri ASSIST_URI = diff --git a/src/com/android/settings/applications/assist/DefaultAssistPicker.java b/src/com/android/settings/applications/assist/DefaultAssistPicker.java index ae4d56be694b4912c375c952908a58c5607bd1e0..20428d72f48c88cfcb55e4a273d7ff4e5cc701fb 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 937e5565b0ff57b3c6c72be5fd98bbacd5893d39..1c900b85fc9e431b43e7140c9943e0ea83e7b57e 100644 --- a/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java @@ -23,7 +23,6 @@ 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; import com.android.settings.R; @@ -32,6 +31,8 @@ import com.android.settingslib.applications.DefaultAppInfo; import java.util.List; +import androidx.annotation.VisibleForTesting; + public class DefaultAssistPreferenceController extends DefaultAppPreferenceController { private final AssistUtils mAssistUtils; diff --git a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java index 15433676dd1e375eed89d74b84f4ab66f58c1421..0f0ebe8db92bf6f901346eca78b8140032438382 100644 --- a/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java +++ b/src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java @@ -20,8 +20,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.net.Uri; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.internal.app.AssistUtils; @@ -34,6 +32,9 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java index fc9264ced9ae479ca1f18374da7fd433b80892cc..6016dbc118f8f96e99837b8cddca40912d58da5c 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java @@ -24,7 +24,6 @@ import android.content.pm.PackageManager; 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; @@ -36,6 +35,8 @@ import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public abstract class DefaultAppPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java index 7d9989ff1cebcad39183f8b2aae0f68dfb670af1..9bb82d4fff004f60d5be5a57b54605dc78fcdd43 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java @@ -30,7 +30,6 @@ 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; @@ -45,6 +44,8 @@ import com.android.settingslib.widget.CandidateInfo; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + public class DefaultAutofillPicker extends DefaultAppPickerFragment { private static final String TAG = "DefaultAutofillPicker"; diff --git a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java index 1cb7985c4c18e0d6ba044052fc6152b23a21880d..626048dfa0cd0e6a786140dcd5e9dcb58fa61235 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPicker.java @@ -22,7 +22,6 @@ import android.content.pm.ResolveInfo; 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 d4e86ff16fe34cd0d2d2ca443f5ae6921fb1cdd4..d3c52b5e948ecf6522c07960a87323390fce76c5 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceController.java @@ -24,7 +24,6 @@ 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.ArraySet; import android.util.IconDrawableFactory; @@ -36,6 +35,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import androidx.preference.Preference; + public class DefaultBrowserPreferenceController extends DefaultAppPreferenceController { private static final String TAG = "BrowserPrefCtrl"; diff --git a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java index b774602aeeb44a352ecb771313775201a0a234c4..5e06d6cf4517cabfee9859b8b12e2553ced93732 100644 --- a/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java +++ b/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceController.java @@ -20,13 +20,14 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.nfc.PaymentBackend; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class DefaultPaymentSettingsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/applications/manageapplications/AppFilterItem.java b/src/com/android/settings/applications/manageapplications/AppFilterItem.java index 8ba7a4c2c2e3247e1e94fe59b495967f517dcb9e..09f88347ebae59791b079911cbd4defdf98f2d0d 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterItem.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterItem.java @@ -16,12 +16,12 @@ package com.android.settings.applications.manageapplications; -import androidx.annotation.StringRes; - import com.android.settingslib.applications.ApplicationsState; import java.util.Objects; +import androidx.annotation.StringRes; + /** * Data model for a displayable app filter. */ diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java index ff584b57e3294bd8cdccbf0115b7efcd43debf24..dc4f22454a0e0d6706dd89f6d6428b0b93471940 100644 --- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java +++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java @@ -16,19 +16,19 @@ 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; import com.android.settingslib.applications.ApplicationsState; +import androidx.annotation.IntDef; + /** * A registry and helper class that manages all {@link AppFilterItem}s for ManageApplications UI. */ diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java index a1a4c22a4bb1ea00e0ba569a603d9c81a609ec02..5e1c710a15b44d92f2677a6ceb7262c875c13064 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; @@ -35,6 +32,10 @@ import com.android.settings.R; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState.AppEntry; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + public class ApplicationViewHolder extends RecyclerView.ViewHolder { private final TextView mAppName; diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index dc9214e59b103c34fc798456a46049e460dd7bc0..06503c2071f9ef8241995b388248b507af2342cf 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -42,7 +42,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 +52,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; @@ -131,6 +126,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.Set; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Activity to pick an application that will be used to display installation information and * options to uninstall/delete user data for system applications. This activity diff --git a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java index 2f33c1e33634227b0d35906bff85cbdb6dffc784..398158e19c07e5937c7e93f595f233745291a911 100644 --- a/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/MusicViewHolderController.java @@ -21,7 +21,6 @@ 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; @@ -31,6 +30,8 @@ import com.android.settingslib.applications.StorageStatsSource; import java.io.IOException; +import androidx.annotation.WorkerThread; + /** * MusicViewHolderController controls an Audio/Music file view in the ManageApplications view. */ diff --git a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java index 6b7c8d6ce07b71a0936205efcc48bcdc9bcb3717..039eb614d2871194b4bdc88450ab1d830e22b92b 100644 --- a/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java +++ b/src/com/android/settings/applications/manageapplications/PhotosViewHolderController.java @@ -20,7 +20,6 @@ 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; @@ -30,6 +29,8 @@ import com.android.settingslib.applications.StorageStatsSource; import java.io.IOException; +import androidx.annotation.WorkerThread; + /** PhotosViewHolderController controls an Audio/Music file view in the ManageApplications view. */ public class PhotosViewHolderController implements FileViewHolderController { private static final String TAG = "PhotosViewHolderCtrl"; diff --git a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java index 3fc3c1dbf4d405a91b57f02d9d0f7ec1ea726a8c..17c2f5a84341a716f53f91307dafd2ce625d8ab7 100644 --- a/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java +++ b/src/com/android/settings/applications/manageapplications/ResetAppPrefPreferenceController.java @@ -18,7 +18,6 @@ package com.android.settings.applications.manageapplications; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; @@ -28,6 +27,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; +import androidx.preference.Preference; + public class ResetAppPrefPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/backup/BackupSettingsActivity.java b/src/com/android/settings/backup/BackupSettingsActivity.java index 5bfb59cee4f110f9c26638d71d53164691c6a0dc..758d3bec0b7ccddc8add1df83db96d9f3dc0f20f 100644 --- a/src/com/android/settings/backup/BackupSettingsActivity.java +++ b/src/com/android/settings/backup/BackupSettingsActivity.java @@ -23,11 +23,9 @@ 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 com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.search.SearchIndexableRaw; @@ -36,6 +34,8 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * The activity used to launch the configured Backup activity or the preference screen diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index d21e2e46365e5fb293ecc8934d9c8601bd0f5aaa..4124fcec472f4781b1a7feaf50fce42a8d47da24 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/BackupSettingsPreferenceController.java b/src/com/android/settings/backup/BackupSettingsPreferenceController.java index ec0c011585cd777c256a050a7dcd1a3fa0600d40..49ee1e531671c31b73d4eb6bbe2486a50db3c227 100644 --- a/src/com/android/settings/backup/BackupSettingsPreferenceController.java +++ b/src/com/android/settings/backup/BackupSettingsPreferenceController.java @@ -19,12 +19,13 @@ package com.android.settings.backup; import android.content.Context; import android.content.Intent; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class BackupSettingsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private static final String BACKUP_SETTINGS = "backup_settings"; diff --git a/src/com/android/settings/backup/ToggleBackupSettingFragment.java b/src/com/android/settings/backup/ToggleBackupSettingFragment.java index d7ff0e6de9e723cb5b562163eb64278e6c835f16..0d1c33e493ecb1f3452c7ac4584ef0f5df3cc26d 100644 --- a/src/com/android/settings/backup/ToggleBackupSettingFragment.java +++ b/src/com/android/settings/backup/ToggleBackupSettingFragment.java @@ -9,9 +9,6 @@ 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; @@ -23,6 +20,10 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.ToggleSwitch; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; + /** * Fragment to display a bunch of text about backup and restore, and allow the user to enable/ * disable it. diff --git a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java index 6f74b54b99b6296bcbd85a3aa3aca208f254e06d..b89706d2e65482efdbe79ccae91e3e6bfd8ec13e 100644 --- a/src/com/android/settings/bluetooth/AlwaysDiscoverable.java +++ b/src/com/android/settings/bluetooth/AlwaysDiscoverable.java @@ -21,14 +21,10 @@ 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; +import androidx.annotation.VisibleForTesting; /** 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 diff --git a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java index ea520ea88bfb4c8a710afefcb5e0aa5dd3a8b2c6..d6549445702e10b33bd62e921ae1e8f04543d615 100644 --- a/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdater.java @@ -19,13 +19,14 @@ 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 com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.dashboard.DashboardFragment; -import com.android.settingslib.bluetooth.LocalBluetoothManager; import com.android.settingslib.bluetooth.CachedBluetoothDevice; +import com.android.settingslib.bluetooth.LocalBluetoothManager; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; /** * Controller to maintain available media Bluetooth devices diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java index 20806458cb64955cae61db40bac47a62d38b247b..a3f444c0fa110e69c1a77647a14691727562bbbb 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsButtonsController.java @@ -17,14 +17,15 @@ package com.android.settings.bluetooth; import android.content.Context; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.widget.ActionButtonPreference; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + /** * This class adds two buttons: one to connect/disconnect from a device (depending on the current * connected state), and one to "forget" (ie unpair) the device. diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsController.java b/src/com/android/settings/bluetooth/BluetoothDetailsController.java index 6ea49a6236d9d400e4a535f80c7f7247c5ca3245..7bf165c19e104e8807c7977dc0eb6634f11eadd1 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsController.java @@ -17,8 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -28,6 +26,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + /** * This class provides common lifecycle and bluetooth device event registration for Bluetooth device * details controllers. diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java index 0a8d8db16717a04ea70165dc4304b6c3c3e2a78f..200dcc2c5e4767e2fc033ddc8c9edeb9e4364d6c 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsHeaderController.java @@ -18,19 +18,20 @@ package com.android.settings.bluetooth; import android.content.Context; import android.graphics.drawable.Drawable; -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.bluetooth.BluetoothUtils; -import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.core.lifecycle.Lifecycle; + +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; /** * 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..8433482f110d08592b347ce08fd7fef26d4870a2 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsMacAddressController.java @@ -17,8 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settingslib.bluetooth.CachedBluetoothDevice; @@ -26,6 +24,9 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixin; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + /** * This class adds the device MAC address to a footer. */ diff --git a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java index 2f0139e46ad2f3212a763770314f0606e96ffebf..ed51a520b754bfe17da537aef5857cf2c6189880 100644 --- a/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java +++ b/src/com/android/settings/bluetooth/BluetoothDetailsProfilesController.java @@ -19,12 +19,6 @@ package com.android.settings.bluetooth; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settingslib.bluetooth.A2dpProfile; @@ -39,6 +33,13 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * This class adds switches for toggling the individual profiles that a Bluetooth device * supports, such as "Phone audio", "Media audio", "Contact sharing", etc. diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index af657432a31ca0d10b31d1b743f36996502662c0..70831374d16fd6e2ea792562c21f71103aa0a722 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -21,7 +21,6 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -34,6 +33,8 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment { public static final String KEY_DEVICE_ADDRESS = "device_address"; private static final String TAG = "BTDeviceDetailsFrg"; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java index 61bed17fe421a11c05cc214bcb1f7bc8b4b4a43d..5b653352102b516161e7ba70bf86950d5723e625 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceController.java @@ -21,9 +21,6 @@ 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; @@ -36,6 +33,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Controller that shows and updates the bluetooth device name */ diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java index c6c0eecd39b273445287c0700a594065e2db9287..85903926afa34b1b86f969e371a73d7ab9a4935f 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,8 +25,6 @@ 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; @@ -35,11 +35,12 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; import com.android.settings.widget.GearPreference; -import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.BluetoothUtils; +import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; -import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; /** * BluetoothDevicePreference is the preference type used to display each remote diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java index 3b07bd3cd209e71a3445b946ac1d4126a7118578..d9246ef3d14dd839f7859d31f1478bd3ad3911dc 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.bluetooth; import android.app.Fragment; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; @@ -27,6 +25,9 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class BluetoothDeviceRenamePreferenceController extends BluetoothDeviceNamePreferenceController { diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java index f7fadf2357a7de3ea48b1e8ba18e7fff3c44ddde..485f691610f302ea7a7b5d118664cbb12f00caa1 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java @@ -19,9 +19,6 @@ 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; @@ -38,6 +35,9 @@ import java.util.Collection; import java.util.HashMap; import java.util.Map; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Update the bluetooth devices. It gets bluetooth event from {@link LocalBluetoothManager} using * {@link BluetoothCallback}. It notifies the upper level whether to add/remove the preference diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java index 189df3a4998632d8a8a38120cc5c397c82cfea6c..3db30053b6de5ff46c10b155183d357490b08f0d 100755 --- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java +++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java @@ -24,13 +24,14 @@ 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 com.android.settings.R; import com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; +import androidx.preference.Preference; + /** * BluetoothDiscoverableEnabler is a helper to manage the "Discoverable" * checkbox. It sets/unsets discoverability and keeps track of how much time diff --git a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java index 8ce701748c15591a9c9583523f4126e8b8ce6f82..73c02ab5afd1f208243ef754bbe35c13dcb67e3c 100644 --- a/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothFilesPreferenceController.java @@ -16,11 +16,9 @@ package com.android.settings.bluetooth; -import android.content.pm.PackageManager; import android.content.Context; import android.content.Intent; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; +import android.content.pm.PackageManager; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.BasePreferenceController; @@ -28,6 +26,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller that shows received files */ diff --git a/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java b/src/com/android/settings/bluetooth/BluetoothNameDialogFragment.java index 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 2f52aef520349e84d0230a98f9926af2adf2098f..af2711c4a5b586f96bbd9ca2dce44fe3c96be9f2 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -22,9 +22,8 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; -import android.widget.Toast; -import androidx.annotation.VisibleForTesting; import android.util.Log; +import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -33,6 +32,8 @@ import com.android.settingslib.bluetooth.BluetoothDeviceFilter; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.widget.FooterPreference; +import androidx.annotation.VisibleForTesting; + /** * BluetoothPairingDetail is a page to scan bluetooth devices and pair them. */ diff --git a/src/com/android/settings/bluetooth/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 3719e06f006952ab0f7a207ff11d7f7c3cab5391..a8b545f4f1bb88f5e1c46333e8203a87fbede622 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -25,6 +24,8 @@ import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + /** * Controller that shows and updates the bluetooth device name diff --git a/src/com/android/settings/bluetooth/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..4467362e35f612fdefbb221cc6fb27f5c0ab2df5 100644 --- a/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java +++ b/src/com/android/settings/bluetooth/BluetoothPermissionActivity.java @@ -23,7 +23,6 @@ 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; @@ -36,6 +35,8 @@ import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import androidx.preference.Preference; + /** * BluetoothPermissionActivity shows a dialog for accepting incoming * profile connection request from untrusted devices. diff --git a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java index 62fc4eff558b37b239d31dffcb04646b2e4ff7b5..08aee5f1c8cfd6cc05e97c2069109b46957fd93e 100644 --- a/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java +++ b/src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java @@ -19,7 +19,6 @@ 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 com.android.settings.R; @@ -29,9 +28,10 @@ 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; +import androidx.annotation.VisibleForTesting; + /** * Helper class that listeners to bluetooth callback and notify client when there is update in * bluetooth summary info. diff --git a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java index bb543bad4963da425d2ddebff5ef3d3b031fda23..ec906a671797d4e235c566a889c198e27a3c810f 100644 --- a/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java +++ b/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdater.java @@ -19,19 +19,16 @@ import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothProfile; import android.content.Context; import android.media.AudioManager; -import android.os.Bundle; import android.util.Log; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - -import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; -import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.bluetooth.CachedBluetoothDevice; import com.android.settingslib.bluetooth.LocalBluetoothManager; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller to maintain connected bluetooth devices */ diff --git a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java index 688fd27e4152211e28f1365e8f8fc901870ed00e..7c7e271e90fc3477ea6d7f67eae1588c7c189f77 100644 --- a/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java +++ b/src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java @@ -20,10 +20,6 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.os.Bundle; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; import android.text.BidiFormatter; import android.util.Log; @@ -38,6 +34,11 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager; import java.util.Collection; import java.util.WeakHashMap; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; + /** * Parent class for settings fragments that contain a list of Bluetooth * devices. diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 3a6865355ed713c39b43adc343108472fe045897..5d404d71289dcbfb21d72c717b57b95bca345e9e 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -25,7 +25,6 @@ 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; @@ -36,6 +35,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * BluetoothSettings is the Settings screen for Bluetooth configuration and * connection management. diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java index d6cdb239d4abcb40a6ff0c321f6e16d9a36d31ff..e30fe8647971ebd4964f3a6572b16d3a2499d7b2 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; @@ -48,6 +47,8 @@ import com.android.settingslib.bluetooth.MapProfile; import com.android.settingslib.bluetooth.PanProfile; import com.android.settingslib.bluetooth.PbapServerProfile; +import androidx.annotation.VisibleForTesting; + public final class DeviceProfilesSettings extends InstrumentedDialogFragment implements CachedBluetoothDevice.Callback, DialogInterface.OnClickListener, OnClickListener { private static final String TAG = "DeviceProfilesSettings"; 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 b5cdaa642667853e559f4e722a563c3d6a70eb51..2b52672f7836cd0941baa34edf287e90ab0710e3 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 android.util.Log; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; /** * Maintain and update saved bluetooth devices(bonded but not connected) diff --git a/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java b/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java index f21e6783bf76199aa8c0b86e57c4744c0d39c259..92bcf93ee74d2a216d0bf16b370895bb644bb7fc 100644 --- a/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java +++ b/src/com/android/settings/bluetooth/Utf8ByteLengthFilter.java @@ -16,10 +16,11 @@ package com.android.settings.bluetooth; -import androidx.annotation.Keep; import android.text.InputFilter; import android.text.Spanned; +import androidx.annotation.Keep; + /** * This filter will constrain edits so that the text length is not * greater than the specified number of bytes using UTF-8 encoding. diff --git a/src/com/android/settings/bluetooth/Utils.java b/src/com/android/settings/bluetooth/Utils.java index 1790af48bd05922ffc42b643f1093e5af7231b92..40864b3a4afc334848061837da0bd6ff8e35a659 100755 --- a/src/com/android/settings/bluetooth/Utils.java +++ b/src/com/android/settings/bluetooth/Utils.java @@ -22,16 +22,17 @@ 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 com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.overlay.FeatureFactory; -import com.android.settingslib.bluetooth.LocalBluetoothManager; -import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback; import com.android.settingslib.bluetooth.BluetoothUtils; import com.android.settingslib.bluetooth.BluetoothUtils.ErrorListener; +import com.android.settingslib.bluetooth.LocalBluetoothManager; +import com.android.settingslib.bluetooth.LocalBluetoothManager.BluetoothManagerCallback; + +import androidx.annotation.VisibleForTesting; /** * Utils is a helper class that contains constants for various diff --git a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java index 9730515343d73f4267f643691a752ed7b17d66ab..2849d714871a132589c9cc39357a07450841e20c 100644 --- a/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/AddDevicePreferenceController.java @@ -21,15 +21,16 @@ 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; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Controller to maintain the {@link androidx.preference.Preference} for add * device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not. diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java index 2ff96a733187a5a59881385615ab58c2267f6762..de6548dd415c15a802dd6e79f71c3867b7e0d291 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceController.java @@ -17,12 +17,13 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.nfc.NfcPreferenceController; +import androidx.annotation.VisibleForTesting; + /** * Controller that used to show which component is available */ diff --git a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java index f94e81a6d4e59c75094caadc28ec8d7f2a932b04..b41863075ca402c3d8ca95c11fc86348cfb722a8 100644 --- a/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java @@ -19,16 +19,13 @@ 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; @@ -36,6 +33,11 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all * available media devices. It uses {@link DevicePreferenceCallback} diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java index bb58cc38d9766e97ca8d298f2838af0cc7d161f1..a8d92a938386424c5b32bdd920d00a6464193729 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 a17dd878fa86a413d677f2b77f1ad4fa4073e93a..27dcac4c6a6a77e0ccd8455dbb983fe0b5cc901f 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -18,13 +18,11 @@ 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; @@ -34,6 +32,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class ConnectedDeviceDashboardFragment extends DashboardFragment { diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java index 654ea7223356cf7f410aa2239e8f71db7c1d8e72..143b72d76ba845032f699d6f9efc8cebc03846dc 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java @@ -15,12 +15,8 @@ */ package com.android.settings.connecteddevice; -import android.content.pm.PackageManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; +import android.content.pm.PackageManager; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater; @@ -31,9 +27,14 @@ 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; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; /** * Controller to maintain the {@link androidx.preference.PreferenceGroup} for all diff --git a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java index a1fb4c1d2bca70319a9675e96c1e38dc35011452..7555a79e768d540357979b286dc63c4362abef9d 100644 --- a/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java +++ b/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceController.java @@ -24,22 +24,23 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.text.BidiFormatter; import android.text.TextUtils; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.bluetooth.AlwaysDiscoverable; import com.android.settings.bluetooth.Utils; 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; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + /** * Controller that shows and updates the bluetooth device name */ diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java index 0b748613427fc263d381a73b05edcdd32aca75f3..c543b7a3bdb3141fc65c3f3d4e59e8c2a7132193 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 27b7676a2f2b998c929df1a949d736f93b9f6880..0234647a44607030b847e7692262d8e545b98490 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -18,10 +18,6 @@ package com.android.settings.connecteddevice; import android.content.Context; import android.content.pm.PackageManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; @@ -32,6 +28,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { diff --git a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java index 6f9b7ac2c046373f634bd5bc3c8d8be2730e126b..c85713522d45bd0469a8fccdcad5abcf5f77641e 100644 --- a/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java +++ b/src/com/android/settings/connecteddevice/SavedDeviceGroupController.java @@ -15,12 +15,8 @@ */ package com.android.settings.connecteddevice; -import android.content.pm.PackageManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; +import android.content.pm.PackageManager; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; @@ -34,6 +30,11 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Controller to maintain the {@link PreferenceGroup} for all * saved devices. It uses {@link DevicePreferenceCallback} to add/remove {@link Preference} diff --git a/src/com/android/settings/connecteddevice/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 4ca12c8a550fbdf87966547c8ca860ec953281da..df5a8fb52138e0121eb5b79c7f7bb04789ef681a 100644 --- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java +++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java @@ -18,14 +18,15 @@ 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; import com.android.settings.R; import com.android.settings.connecteddevice.DevicePreferenceCallback; import com.android.settings.core.SubSettingLauncher; import com.android.settings.dashboard.DashboardFragment; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller to maintain connected usb device */ diff --git a/src/com/android/settings/connecteddevice/usb/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..fbcd5d19cd22822d25219fbee2e994d93002db0f 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsController.java @@ -18,12 +18,13 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.os.Handler; -import androidx.annotation.UiThread; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.annotation.UiThread; + /** * This class provides common members and refresh functionality for usb controllers. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java index 2e336e48960faddec40640f7a9d0cf26564f4ca9..e1ffac983306d686bab81f2c6add067b8687afdd 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleController.java @@ -18,13 +18,14 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.RadioButtonPreference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** * This class controls the radio buttons for switching between * USB device and host mode. diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index d7b74444a908bc93ed34ebff9643e5d5d7138051..7b1026c4dca6c4fe2f78cef834cb5b04651465bf 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -19,7 +19,6 @@ 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; import com.android.settings.R; @@ -34,6 +33,8 @@ import com.google.android.collect.Lists; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Controls the USB device details and provides updates to individual controllers. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java index 8ae334c3a8fe01838f3785aba73978f73b6732bf..4bdb60b1d376c3f3b08b31fa6642455ff72ebd75 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java @@ -19,8 +19,6 @@ 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; import com.android.settings.R; import com.android.settings.Utils; @@ -29,6 +27,9 @@ import com.android.settings.widget.RadioButtonPreference; import java.util.LinkedHashMap; import java.util.Map; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** * This class controls the radio buttons for choosing between different USB functions. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java index c569e1f9bd2efd48320e24fb5f4633ff9a198843..a66481250171b14e4a2aaaf4029c5443a3ca6730 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java @@ -17,12 +17,13 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.EntityHeaderController; +import androidx.preference.PreferenceScreen; + /** * This class adds a header with device name. */ diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java index ae21601e780ad3ff650db42484d4df5b576b56d9..c6efd1945645ea9fac3ef6b0a6b291fc86626386 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsPowerRoleController.java @@ -18,14 +18,15 @@ package com.android.settings.connecteddevice.usb; import android.content.Context; import android.hardware.usb.UsbPort; -import androidx.preference.SwitchPreference; + +import com.android.settings.R; +import com.android.settings.Utils; + import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceClickListener; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; - -import com.android.settings.R; -import com.android.settings.Utils; +import androidx.preference.SwitchPreference; /** * This class controls the switch for changing USB power direction. diff --git a/src/com/android/settings/core/InstrumentedPreferenceFragment.java b/src/com/android/settings/core/InstrumentedPreferenceFragment.java index 3a3c3d9e19009d1a7dbe8c2cc967bf4264f17f84..30157e97e511cfff74562dff58b4dc478add452f 100644 --- a/src/com/android/settings/core/InstrumentedPreferenceFragment.java +++ b/src/com/android/settings/core/InstrumentedPreferenceFragment.java @@ -18,8 +18,6 @@ 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; @@ -30,6 +28,9 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; import com.android.settingslib.core.lifecycle.ObservablePreferenceFragment; +import androidx.annotation.XmlRes; +import androidx.preference.PreferenceScreen; + /** * Instrumented fragment that logs visibility state. */ diff --git a/src/com/android/settings/core/PreferenceXmlParserUtils.java b/src/com/android/settings/core/PreferenceXmlParserUtils.java index a0534ab48ce4a94ae384a208f2bef637d508745d..ff196dcaaf6e4db402c02906ce5dc0402fb6ea9f 100644 --- a/src/com/android/settings/core/PreferenceXmlParserUtils.java +++ b/src/com/android/settings/core/PreferenceXmlParserUtils.java @@ -23,8 +23,6 @@ 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; @@ -43,6 +41,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + /** * Utility class to parse elements of XML preferences */ diff --git a/src/com/android/settings/core/SliderPreferenceController.java b/src/com/android/settings/core/SliderPreferenceController.java index 65c71eb4219361cb7d4f81604e449ee3d3188c9a..8cae29a5915fb40d44498f01d8b95b59d4cf6f6d 100644 --- a/src/com/android/settings/core/SliderPreferenceController.java +++ b/src/com/android/settings/core/SliderPreferenceController.java @@ -15,10 +15,11 @@ package com.android.settings.core; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.slices.SliceData; +import androidx.preference.Preference; + public abstract class SliderPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/core/SubSettingLauncher.java b/src/com/android/settings/core/SubSettingLauncher.java index 16eea00270b9acebaf1b6566f46b7b60cb780dda..3268399d59515ded72743573592c44006e1bfe20 100644 --- a/src/com/android/settings/core/SubSettingLauncher.java +++ b/src/com/android/settings/core/SubSettingLauncher.java @@ -22,13 +22,14 @@ 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 com.android.settings.SettingsActivity; import com.android.settings.SubSettings; import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin; +import androidx.annotation.VisibleForTesting; + public class SubSettingLauncher { private final Context mContext; diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java index 3a199b896500cd7d878f2ab3f968cf652f67beb9..6c9df2a628a0b5bbcab58471b47ad9e163f6df35 100644 --- a/src/com/android/settings/core/TogglePreferenceController.java +++ b/src/com/android/settings/core/TogglePreferenceController.java @@ -14,12 +14,13 @@ package com.android.settings.core; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import com.android.settings.slices.SliceData; import com.android.settings.widget.MasterSwitchPreference; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; + /** * Abstract class that consolidates logic for updating toggle controllers. * It automatically handles the getting and setting of the switch UI element. diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java index fbe7399662d7d70ab0df313a7dfbdb5c9cb25925..4d24ad3b929b0e5798354c7d19f635e2ceeeae84 100644 --- a/src/com/android/settings/core/gateway/SettingsGateway.java +++ b/src/com/android/settings/core/gateway/SettingsGateway.java @@ -17,7 +17,6 @@ package com.android.settings.core.gateway; import com.android.settings.DateTimeSettings; -import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings; import com.android.settings.DisplaySettings; import com.android.settings.IccLockSettings; import com.android.settings.MasterClear; @@ -50,6 +49,7 @@ import com.android.settings.applications.appops.BackgroundCheckSummary; import com.android.settings.applications.assist.ManageAssist; import com.android.settings.applications.manageapplications.ManageApplications; import com.android.settings.applications.managedomainurls.ManageDomainUrls; +import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings; import com.android.settings.backup.PrivacySettings; import com.android.settings.backup.ToggleBackupSettingFragment; import com.android.settings.bluetooth.BluetoothDeviceDetailsFragment; diff --git a/src/com/android/settings/dashboard/DashboardAdapter.java b/src/com/android/settings/dashboard/DashboardAdapter.java index 000a2afdafef078f19fb906aa8954d574490b1e9..936164c9bb2624c4ca41b8c860a725d2d5353013 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; @@ -54,6 +50,11 @@ import com.android.settingslib.utils.IconCache; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class DashboardAdapter extends RecyclerView.Adapter implements SummaryLoader.SummaryConsumer, SuggestionAdapter.Callback, LifecycleObserver, OnSaveInstanceState { diff --git a/src/com/android/settings/dashboard/DashboardData.java b/src/com/android/settings/dashboard/DashboardData.java index 2ef4abe84b12bf8d8ff9371ef24b6bde23faab06..9f66731e245103bce1ee3c3d21dc03c5c16c0500 100644 --- a/src/com/android/settings/dashboard/DashboardData.java +++ b/src/com/android/settings/dashboard/DashboardData.java @@ -18,8 +18,6 @@ package com.android.settings.dashboard; import android.annotation.IntDef; import android.graphics.drawable.Drawable; import android.service.settings.suggestions.Suggestion; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.DiffUtil; import android.text.TextUtils; import com.android.settings.R; @@ -33,6 +31,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.DiffUtil; + /** * Description about data list used in the DashboardAdapter. In the data list each item can be * Condition, suggestion or category tile. diff --git a/src/com/android/settings/dashboard/DashboardFeatureProvider.java b/src/com/android/settings/dashboard/DashboardFeatureProvider.java index b1f66ae4792c1528bf310b4cdd7c22371f323968..35d50fb0657e72968a9ec400d0313a9609136d1d 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProvider.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProvider.java @@ -17,13 +17,14 @@ package com.android.settings.dashboard; import android.app.Activity; import android.content.Context; -import androidx.preference.Preference; import com.android.settingslib.drawer.DashboardCategory; import com.android.settingslib.drawer.Tile; import java.util.List; +import androidx.preference.Preference; + /** * FeatureProvider for dashboard (aka settings homepage). */ diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index c98c982013d0d3f8092520e596f72aa5a4e5e64b..48bd2952d46d473cf8686dce10406b50fe18e66d 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -29,8 +29,6 @@ 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; @@ -53,6 +51,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Impl for {@code DashboardFeatureProvider}. */ diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index bef66c3650ad38b799bc5a9cfb455a90710db048..ecf905eff0099658bb3b9efde06cad7e42b20b19 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -19,10 +19,6 @@ 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; @@ -47,6 +43,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + /** * Base fragment for dashboard style UI containing a list of static and dynamic setting items. */ diff --git a/src/com/android/settings/dashboard/DashboardItemAnimator.java b/src/com/android/settings/dashboard/DashboardItemAnimator.java index 73224ab2358fb4d6c375cc2e87daf3dcad7dbbcc..332e915b9e2b127e5a2674a68ea7f5de2f0bb36a 100644 --- a/src/com/android/settings/dashboard/DashboardItemAnimator.java +++ b/src/com/android/settings/dashboard/DashboardItemAnimator.java @@ -15,10 +15,11 @@ */ package com.android.settings.dashboard; +import com.android.settingslib.drawer.Tile; + import androidx.core.view.ViewCompat; import androidx.recyclerview.widget.DefaultItemAnimator; import androidx.recyclerview.widget.RecyclerView.ViewHolder; -import com.android.settingslib.drawer.Tile; public class DashboardItemAnimator extends DefaultItemAnimator { diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index e680afdfab3548429e30b6c58ad2b47a19f5f3fa..0bb4ce2898c7db199cd9c592ab0cf13395ba8fa8 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/src/com/android/settings/dashboard/DashboardSummary.java @@ -22,9 +22,6 @@ 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; @@ -50,6 +47,10 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.LinearLayoutManager; + public class DashboardSummary extends InstrumentedFragment implements CategoryListener, ConditionListener, FocusListener, SuggestionControllerMixin.SuggestionControllerHost { diff --git a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java index 7b532752866c849b0f153549de1de3957274d40e..8bae1513640b0a183c10083f79a4cf85d4955711 100644 --- a/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java +++ b/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java @@ -17,12 +17,13 @@ package com.android.settings.dashboard; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * PreferenceController for a dashboard_tile_placeholder, a special preference marking where * dynamic dashboard tiles should be injected in a screen. It is optional when building diff --git a/src/com/android/settings/dashboard/RestrictedDashboardFragment.java b/src/com/android/settings/dashboard/RestrictedDashboardFragment.java index 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/SummaryLoader.java b/src/com/android/settings/dashboard/SummaryLoader.java index a97113147ed5cecc3ee06598000a24110ae90a7c..ffd62464851a07fdec9b8bff19e3c24cecd1759e 100644 --- a/src/com/android/settings/dashboard/SummaryLoader.java +++ b/src/com/android/settings/dashboard/SummaryLoader.java @@ -25,7 +25,6 @@ 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; @@ -40,6 +39,8 @@ import com.android.settingslib.utils.ThreadUtils; import java.lang.reflect.Field; import java.util.List; +import androidx.annotation.VisibleForTesting; + public class SummaryLoader { private static final boolean DEBUG = DashboardSummary.DEBUG; private static final String TAG = "SummaryLoader"; diff --git a/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java b/src/com/android/settings/dashboard/conditional/BatterySaverCondition.java index ab7f79208ce4de6cd242cb08e922ca01ba2326f8..b0c1de4edb19f19c8f96779d463dcfd0e512a9b2 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..82452ff6f0c54f0a58be54be69209bd746566349 100644 --- a/src/com/android/settings/dashboard/conditional/Condition.java +++ b/src/com/android/settings/dashboard/conditional/Condition.java @@ -21,12 +21,13 @@ 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; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import androidx.annotation.VisibleForTesting; + public abstract class Condition { private static final String KEY_SILENCE = "silence"; diff --git a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java index 923f1241a531c71f4627388750b5ab3d992f1aff..a6478e21867a4c95e48bb4a6709e435267c61de4 100644 --- a/src/com/android/settings/dashboard/conditional/ConditionAdapter.java +++ b/src/com/android/settings/dashboard/conditional/ConditionAdapter.java @@ -16,9 +16,6 @@ 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; @@ -35,6 +32,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.List; import java.util.Objects; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + public class ConditionAdapter extends RecyclerView.Adapter { public static final String TAG = "ConditionAdapter"; diff --git a/src/com/android/settings/dashboard/conditional/DndCondition.java b/src/com/android/settings/dashboard/conditional/DndCondition.java index 5b890a23fbe9b241907a23e62cadc1de7a3d7999..32184e174fc8e7684d5b9f0f223b4b0d5f1a6de9 100644 --- a/src/com/android/settings/dashboard/conditional/DndCondition.java +++ b/src/com/android/settings/dashboard/conditional/DndCondition.java @@ -25,13 +25,14 @@ 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; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settings.notification.ZenModeSettings; +import androidx.annotation.VisibleForTesting; + public class DndCondition extends Condition { private static final String TAG = "DndCondition"; 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 da0991bf7a2195a085c4a6983e0c70821446689b..9b964e104b674c62be9075e2172d70f73be01ec7 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,7 +30,6 @@ 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 com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -51,6 +48,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + public class SuggestionAdapter extends RecyclerView.Adapter implements LifecycleObserver, OnSaveInstanceState { public static final String TAG = "SuggestionAdapter"; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java index ef3513c4d42784065f33db6b09b358be8f88a1d4..ce2d1185f0d5b16858dcecd23e88f56472be68f0 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java @@ -20,7 +20,6 @@ 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 com.android.settingslib.drawer.Tile; @@ -28,6 +27,8 @@ import com.android.settingslib.suggestions.SuggestionControllerMixin; import java.util.List; +import androidx.annotation.NonNull; + /** Interface should be implemented if you have added new suggestions */ public interface SuggestionFeatureProvider { diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index e4c99cd87ed129c5c1ca1989ae618c28cb99f9c2..f71a6bc963d84bc71aedc90d5e2a93adc5c924eb 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java @@ -21,9 +21,6 @@ import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; import android.service.settings.suggestions.Suggestion; - -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; import android.util.Log; import android.util.Pair; @@ -46,6 +43,8 @@ import com.android.settingslib.suggestions.SuggestionControllerMixin; import java.util.List; +import androidx.annotation.NonNull; + public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider { private static final String TAG = "SuggestionFeature"; diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java index 1474f83e55a8edf1517912c0109d600d98a6480c..4b47dfdfea470f15b5656aa8002cf6e77eb76b05 100644 --- a/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java +++ b/src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java @@ -25,11 +25,12 @@ 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 com.android.settings.overlay.FeatureFactory; +import androidx.annotation.VisibleForTesting; + public class SuggestionStateProvider extends ContentProvider { private static final String TAG = "SugstStatusProvider"; diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 91563bb270af59baf760db1e86cd17575b349cff..d2950b36bf7b0fb87a8bf4d3a2f2c27985658f85 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -32,9 +32,6 @@ 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; @@ -54,6 +51,10 @@ import com.android.settingslib.net.ChartDataLoader; import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + public class AppDataUsage extends DataUsageBase implements Preference.OnPreferenceChangeListener, DataSaverBackend.Listener { diff --git a/src/com/android/settings/datausage/AppDataUsagePreference.java b/src/com/android/settings/datausage/AppDataUsagePreference.java index 7595eb56a489873c54834a6a20893a6f2c06ce97..a8168c4a7d16cc3ac5ef49d605a03fd29c137dca 100644 --- a/src/com/android/settings/datausage/AppDataUsagePreference.java +++ b/src/com/android/settings/datausage/AppDataUsagePreference.java @@ -15,7 +15,6 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.view.View; import android.widget.ProgressBar; @@ -25,6 +24,8 @@ import com.android.settingslib.net.UidDetail; import com.android.settingslib.net.UidDetailProvider; import com.android.settingslib.utils.ThreadUtils; +import androidx.preference.PreferenceViewHolder; + public class AppDataUsagePreference extends AppPreference { private final AppItem mItem; diff --git a/src/com/android/settings/datausage/AppPrefLoader.java b/src/com/android/settings/datausage/AppPrefLoader.java index 690ac2dbfcfb3515ae79205951999302d4e0173f..63c5c53c90fb264450ed7703aa9f3d514418fbf8 100644 --- a/src/com/android/settings/datausage/AppPrefLoader.java +++ b/src/com/android/settings/datausage/AppPrefLoader.java @@ -19,10 +19,12 @@ 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 com.android.settingslib.utils.AsyncLoader; +import androidx.preference.Preference; + public class AppPrefLoader extends AsyncLoader> { private ArraySet mPackages; private PackageManager mPackageManager; diff --git a/src/com/android/settings/datausage/CellDataPreference.java b/src/com/android/settings/datausage/CellDataPreference.java index fb97cd89320eb0de4dd0d7c886072be11d9f90a0..508b2d0a89a21604b57e8ac576309826d035a043 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; @@ -44,6 +41,10 @@ import com.android.settingslib.CustomDialogPreference; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; + public class CellDataPreference extends CustomDialogPreference implements TemplatePreference { private static final String TAG = "CellDataPreference"; diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java index 3e29896a38362da10097ee3ece5a985f4a05eb8a..80a60426b5896e7c46466c9fff368afaca6ad783 100644 --- a/src/com/android/settings/datausage/DataSaverPreference.java +++ b/src/com/android/settings/datausage/DataSaverPreference.java @@ -15,10 +15,12 @@ package com.android.settings.datausage; import android.content.Context; -import androidx.preference.Preference; import android.util.AttributeSet; + import com.android.settings.R; +import androidx.preference.Preference; + public class DataSaverPreference extends Preference implements DataSaverBackend.Listener { private final DataSaverBackend mDataSaverBackend; diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java index 47887b3d4937f6705d67254d0a774a3db090a9f1..6482f87182ab3df30edacde50622797619a83a63 100644 --- a/src/com/android/settings/datausage/DataSaverSummary.java +++ b/src/com/android/settings/datausage/DataSaverSummary.java @@ -16,7 +16,6 @@ package com.android.settings.datausage; import android.app.Application; import android.os.Bundle; -import androidx.preference.Preference; import android.widget.Switch; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -34,6 +33,8 @@ import com.android.settingslib.applications.ApplicationsState.Session; import java.util.ArrayList; +import androidx.preference.Preference; + public class DataSaverSummary extends SettingsPreferenceFragment implements OnSwitchChangeListener, Listener, Callback, Callbacks { 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 6f30546f0b86e1a803d230f3807a686bd2b80aca..59f3c0ef5b9c4bb4d5cb5129664ea228d8188d36 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; @@ -70,6 +67,10 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + /** * Panel showing data usage history across various networks, including options * to inspect based on usage cycle and control through {@link NetworkPolicy}. diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java index 19e3bc08053085b6cf596785908e4bb0f8fd17bc..d0e48710cbc9cbd2a5c8f7d792f54bebcb1c34fa 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; @@ -45,6 +43,9 @@ import com.android.settingslib.utils.StringUtil; import java.util.Objects; import java.util.concurrent.TimeUnit; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * Provides a summary of data usage. */ diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java index 8e63ca91a535e38ffa5a871a00fbea202695c8a5..8cbd82d47966654b08877d4f1b3e28bba4120d0e 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; @@ -45,6 +42,10 @@ import com.android.settingslib.net.DataUsageController; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; + /** * This is the controller for the top of the data usage screen that retrieves carrier data from the * new subscriptions framework API if available. The controller reads subscription information from diff --git a/src/com/android/settings/datausage/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..15a07dc8c702b2cc919505ece3f96745d53f1b40 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -15,14 +15,16 @@ 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 com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class SpinnerPreference extends Preference implements CycleAdapter.SpinnerInterface { private CycleAdapter mAdapter; 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/datetime/AutoTimeFormatPreferenceController.java b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java index 42ea41a905a842bbd69d485e167a3711dd751ccd..f191a134077aca16e03b8a0e03ea9b8d09a712d6 100644 --- a/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeFormatPreferenceController.java @@ -19,15 +19,18 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; + import java.util.Locale; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + public class AutoTimeFormatPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/datetime/AutoTimePreferenceController.java b/src/com/android/settings/datetime/AutoTimePreferenceController.java index 22c01ec78099be8455d16d1c00644fe561b38f21..a5da34a9ca97e7818d58140cfa0308e7e103dbb2 100644 --- a/src/com/android/settings/datetime/AutoTimePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimePreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class AutoTimePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java index f9a4821fa8a9921d975aa9082c3f468ef329706b..a0355b2f355c00d93902d8540a1ab4a16069a726 100644 --- a/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/AutoTimeZonePreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.datetime; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class AutoTimeZonePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java index 2be6b80afc663ccdcc36d565d9ffaff72869c907..25af357bcde84132f3af821b142237f4c3a90cef 100644 --- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java +++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java @@ -19,9 +19,6 @@ 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; @@ -31,6 +28,10 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.Calendar; import java.util.Date; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; +import androidx.preference.TwoStatePreference; + public class TimeFormatPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/datetime/TimePreferenceController.java b/src/com/android/settings/datetime/TimePreferenceController.java index 58173711a90f7d6abee215aa3802e0f7406c6588..8bb292c694c0097ae5bd6fe644bd5eec79125a75 100644 --- a/src/com/android/settings/datetime/TimePreferenceController.java +++ b/src/com/android/settings/datetime/TimePreferenceController.java @@ -20,7 +20,6 @@ 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; @@ -31,6 +30,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.Calendar; +import androidx.preference.Preference; + public class TimePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, TimePickerDialog.OnTimeSetListener { diff --git a/src/com/android/settings/datetime/TimeZonePreferenceController.java b/src/com/android/settings/datetime/TimeZonePreferenceController.java index 801f417c30e39fb856a3bfd25cfdc3cee92755a8..76c2455f1fd294081137d4fac4beaf2490513241 100644 --- a/src/com/android/settings/datetime/TimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/TimeZonePreferenceController.java @@ -17,8 +17,6 @@ package com.android.settings.datetime; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; @@ -27,6 +25,9 @@ import com.android.settingslib.datetime.ZoneGetter; import java.util.Calendar; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class TimeZonePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java index 253bd2f151254da2a6912faeaa941c488264b202..a06768718a990d4e1bdd4a234bb1b0f1b15f4bbd 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; @@ -36,6 +31,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.annotation.WorkerThread; +import androidx.recyclerview.widget.RecyclerView; + /** * Used with {@class BaseTimeZonePicker}. It renders text in each item into list view. A list of * {@class AdapterItem} must be provided when an instance is created. diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java index 83b85c0704599d92e21ff10b3ef71977e6d6b47d..fa0be2ea2c90f9b47578be002ccf4314ab039d58 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java @@ -23,7 +23,6 @@ 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; import com.android.settings.datetime.timezone.model.TimeZoneData; @@ -33,6 +32,8 @@ import java.util.Date; import java.util.List; import java.util.Locale; +import androidx.annotation.Nullable; + /** * Render a list of {@class TimeZoneInfo} into the list view in {@class BaseTimeZonePicker} */ diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java index 6d93ac91de24dabaa4710c1c9015396807fdbe89..5e1471b7d63a0a069906f8f7405fe1a090c89519 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,6 @@ import android.widget.LinearLayout; import android.widget.SearchView; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.core.InstrumentedFragment; import com.android.settings.datetime.timezone.model.TimeZoneData; @@ -38,6 +34,9 @@ import com.android.settings.datetime.timezone.model.TimeZoneDataLoader; import java.util.Locale; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * It's abstract class. Subclass should use it with {@class BaseTimeZoneAdapter} and * {@class AdapterItem} to provide a list view with text search capability. diff --git a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java index 3e731f62715b469cefbdb157db2d3791afaac562..89b68cbc73baafc92c3cf9fd389de921250a944a 100644 --- a/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java @@ -17,12 +17,13 @@ package com.android.settings.datetime.timezone; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.google.common.base.Objects; +import androidx.preference.Preference; + public abstract class BaseTimeZonePreferenceController extends BasePreferenceController { private OnPreferenceClickListener mOnClickListener; diff --git a/src/com/android/settings/datetime/timezone/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..ea4c7ee44134bde4466b49e5249921691597e86d 100644 --- a/src/com/android/settings/datetime/timezone/RegionSearchPicker.java +++ b/src/com/android/settings/datetime/timezone/RegionSearchPicker.java @@ -21,7 +21,6 @@ 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 com.android.internal.logging.nano.MetricsProto; @@ -37,6 +36,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; +import androidx.annotation.VisibleForTesting; + /** * Render a list of regions into a list view. */ diff --git a/src/com/android/settings/datetime/timezone/RegionZonePicker.java b/src/com/android/settings/datetime/timezone/RegionZonePicker.java index 7a3378acb5e6273239dd3e003dcfea1e2f849b2b..ea8d3280eb94aa1210a1ba4c2383533238cba180 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePicker.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePicker.java @@ -21,8 +21,6 @@ import android.icu.text.Collator; import android.icu.text.LocaleDisplayNames; import android.icu.util.TimeZone; import android.os.Bundle; -import androidx.annotation.Nullable; -import androidx.annotation.VisibleForTesting; import android.util.Log; import com.android.internal.logging.nano.MetricsProto; @@ -38,6 +36,9 @@ import java.util.Date; import java.util.List; import java.util.TreeSet; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; + /** * Given a region, render a list of time zone {@class TimeZoneInfo} into a list view. */ diff --git a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java index 79539c3577259c55f57200aed3478707f920c15b..8d08c6ba1d8c53de232f1758423ac71409e55fe9 100644 --- a/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java +++ b/src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java @@ -17,10 +17,11 @@ package com.android.settings.datetime.timezone; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; +import androidx.preference.Preference; + public class RegionZonePreferenceController extends BaseTimeZonePreferenceController { private static final String PREFERENCE_KEY = "region_zone"; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java index c64726fbae4eb7398583258f40f8c3c72b697582..95448296719eb6bdc4100dfa10ac0ee5ae7211c5 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java @@ -24,14 +24,15 @@ 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; import com.android.settings.R; import com.android.settingslib.widget.FooterPreference; import java.util.Date; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController { private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER; diff --git a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java index 354889965844b435b006a0ec04211c0003291427..23b09f5232d9c186bbf89fa12e46c703aff2dd54 100644 --- a/src/com/android/settings/datetime/timezone/TimeZoneSettings.java +++ b/src/com/android/settings/datetime/timezone/TimeZoneSettings.java @@ -23,8 +23,6 @@ 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; @@ -46,6 +44,9 @@ import java.util.Locale; import java.util.Objects; import java.util.Set; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceCategory; + /** * The class displays a time zone picker either by regions or fixed offset time zones. */ diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java index c9148450691a3023ddaa7dd23508964ced07a3b6..b7ba66d667c845cdb6e1fe284b813ba31c9e1fec 100644 --- a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java +++ b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java @@ -15,9 +15,6 @@ */ package com.android.settings.datetime.timezone.model; -import androidx.annotation.VisibleForTesting; -import androidx.collection.ArraySet; - import libcore.util.CountryTimeZones; import libcore.util.CountryZonesFinder; import libcore.util.TimeZoneFinder; @@ -29,6 +26,9 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import androidx.annotation.VisibleForTesting; +import androidx.collection.ArraySet; + /** * Wrapper of CountryZonesFinder to normalize the country code and only show the regions that are * has time zone shown in the time zone picker. diff --git a/src/com/android/settings/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..d228fa78a25bf3fd13c85ba1cd39dda4031dd9d3 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceController.java @@ -16,8 +16,6 @@ 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; @@ -26,6 +24,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Handles the wall of text which appears below the options in the Storage Management settings drill * down. diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index e184b121800ed95cf7f1da8bc53396e82f3cba13..a0c450a3f1514c7a45edb5f16de0a52c85970115 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -20,9 +20,6 @@ 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; @@ -41,6 +38,10 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; + /** * AutomaticStorageManagerSettings is the Settings screen for configuration and management of the * automatic storage manager. diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarController.java index 011deffc95073c10e55cc528d343c642a4bab0ca..6d6b544e29ada56c922a3e1b650ffed9d348eee1 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 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; + +import androidx.preference.Preference; /** 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..b27a36235e5ae0a8382a3703cf995784ac8300c6 100644 --- a/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java +++ b/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceController.java @@ -21,10 +21,6 @@ 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; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; @@ -33,6 +29,11 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnDestroy; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class AbstractBluetoothA2dpPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, BluetoothServiceConnectionListener, LifecycleObserver, diff --git a/src/com/android/settings/development/AdbPreferenceController.java b/src/com/android/settings/development/AdbPreferenceController.java index 86622eec5a75711212ed2e2a1239886607ddeba2..32812e534c689cecda5b6d2878853660097a9d53 100644 --- a/src/com/android/settings/development/AdbPreferenceController.java +++ b/src/com/android/settings/development/AdbPreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.development; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.AbstractEnableAdbPreferenceController; +import androidx.annotation.Nullable; +import androidx.preference.Preference; + public class AdbPreferenceController extends AbstractEnableAdbPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java index c785bb67e24227cdcc3997cb8ae52dd56ccbe1cf..974591cec3ceb5db68729e0e1af25dd2e3bcefbe 100644 --- a/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java +++ b/src/com/android/settings/development/AllowAppsOnExternalPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class AllowAppsOnExternalPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java index 35943951db4b18697af9849187fe3a5df943d05f..e53037c3d284535fa7a2c95a065883cc17ea23f4 100644 --- a/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java +++ b/src/com/android/settings/development/AnimatorDurationScalePreferenceController.java @@ -19,15 +19,16 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; -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; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class AnimatorDurationScalePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java index 19db369d285a9bad2a25cdea2d54e647f0d5a792..dbf01428096b163d4adfb688004ff3d5c169c3c8 100644 --- a/src/com/android/settings/development/AppsNotRespondingPreferenceController.java +++ b/src/com/android/settings/development/AppsNotRespondingPreferenceController.java @@ -17,13 +17,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class AppsNotRespondingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java index 7333aad656aed3e6a912f96e1fdcc9a94640dd32..5651d9b3f05c7795bfc40e0e99868252ba56e293 100644 --- a/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java +++ b/src/com/android/settings/development/BackgroundProcessLimitPreferenceController.java @@ -20,14 +20,15 @@ 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; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class BackgroundProcessLimitPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java index 6ba0a80417aebfb1ac90fae6ed31cc00f94e43fe..860b2ef4dd04b94e9f86a4d008024e052eda203d 100644 --- a/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java +++ b/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceController.java @@ -18,13 +18,13 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class BluetoothA2dpHwOffloadPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java b/src/com/android/settings/development/BluetoothA2dpHwOffloadRebootDialog.java index 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..829f3fbafe604aa8127cc27f5fa0ac019f6976a4 100644 --- a/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java +++ b/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class BluetoothAbsoluteVolumePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java index 688f125d1a698db60f6d4a8c95e23b262b7cbba3..0aba44a1e525e2dc1ce0bd47454b21456cc015e7 100644 --- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java +++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java @@ -18,15 +18,16 @@ 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; import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class BluetoothAvrcpVersionPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java index 3e913bdfca14f12cd688ff6e89a1110f3689034a..e56de101e30487b3c5238fae2f115c659c157ebc 100644 --- a/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java +++ b/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class BluetoothDeviceNoNamePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java index 6ad3689334a0838ad50fe4b19f42aa9fc1670ce5..0960625da933b13afeeacce145ef84a43165434f 100644 --- a/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java +++ b/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceController.java @@ -18,14 +18,15 @@ package com.android.settings.development; import android.content.Context; import android.os.SystemProperties; + +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.development.DeveloperOptionsPreferenceController; - public class BluetoothMaxConnectedAudioDevicesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java index 4b1bf5cb292358a7809d878590e86a7bb8aab8ab..0372cd6193bcbf1fbdc9ad5e680ed366c846b404 100644 --- a/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java +++ b/src/com/android/settings/development/BluetoothSnoopLogPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class BluetoothSnoopLogPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/BugReportInPowerPreferenceController.java b/src/com/android/settings/development/BugReportInPowerPreferenceController.java index 22b9f2b86ae8e9939dd7849bd495308b90bcd1c8..f09b4869837efe4920678450e358efbe7e6d572f 100644 --- a/src/com/android/settings/development/BugReportInPowerPreferenceController.java +++ b/src/com/android/settings/development/BugReportInPowerPreferenceController.java @@ -19,13 +19,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class BugReportInPowerPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java index 74f879462c2e7c795b5268e4c09c2036798ec4a4..253eed835f1600ba689731e9d4ccad74aadf1e3f 100644 --- a/src/com/android/settings/development/CameraLaserSensorPreferenceController.java +++ b/src/com/android/settings/development/CameraLaserSensorPreferenceController.java @@ -18,8 +18,6 @@ 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 com.android.internal.annotations.VisibleForTesting; @@ -27,6 +25,9 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class CameraLaserSensorPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java index 9598b377f9770ecf374d29bbface2309d3ffabd1..84978090693282cf6e1e6b16e515bc9f4988b854 100644 --- a/src/com/android/settings/development/ClearAdbKeysPreferenceController.java +++ b/src/com/android/settings/development/ClearAdbKeysPreferenceController.java @@ -22,9 +22,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; @@ -32,6 +29,10 @@ import com.android.settings.Utils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ClearAdbKeysPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ColorModePreference.java b/src/com/android/settings/development/ColorModePreference.java index 54ca4687850fbe1a8a17e5034d6d471ec3a47448..8f9ef3aae6ebb7e74d1bb61af520cc578e921243 100644 --- a/src/com/android/settings/development/ColorModePreference.java +++ b/src/com/android/settings/development/ColorModePreference.java @@ -21,7 +21,6 @@ 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; @@ -30,6 +29,8 @@ import com.android.settings.R; import java.util.ArrayList; import java.util.List; +import androidx.preference.SwitchPreference; + public class ColorModePreference extends SwitchPreference implements DisplayListener { private DisplayManager mDisplayManager; diff --git a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java index ae459acbcabf27290faf4b6d807405c8cfe7ff4c..c141ef56578e212af6cb35be4b5651b1c35e2101 100644 --- a/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java +++ b/src/com/android/settings/development/CoolColorTemperaturePreferenceController.java @@ -18,9 +18,6 @@ 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 android.widget.Toast; import com.android.settings.R; @@ -28,6 +25,10 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class CoolColorTemperaturePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DarkUIPreferenceController.java b/src/com/android/settings/development/DarkUIPreferenceController.java index fc457716bc607adfc1a7d127cc90a194b91c5266..85f171b8a69403a72010eba4e1ce3b0bb79f5239 100644 --- a/src/com/android/settings/development/DarkUIPreferenceController.java +++ b/src/com/android/settings/development/DarkUIPreferenceController.java @@ -18,14 +18,15 @@ 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; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class DarkUIPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java index 9b3f1d834710b1fa0c36f597effb0e8aa2b66c99..68aae93be2ccf7db7a4927cb221de90511f9c706 100644 --- a/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java +++ b/src/com/android/settings/development/DebugGpuOverdrawPreferenceController.java @@ -18,8 +18,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class DebugGpuOverdrawPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java index 03e3dab18e94451a2bfc933316b5ba23dc2d4f55..ae4070dd9cd4e82267627ac857d0bbf17fde0c76 100644 --- a/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java +++ b/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceController.java @@ -18,8 +18,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class DebugNonRectClipOperationsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java index 8950b86bdcd92330b2a94fbdb786ee30597478b9..963eb3bdb5bc60536de0024e13b77be1052fea85 100644 --- a/src/com/android/settings/development/DebugViewAttributesPreferenceController.java +++ b/src/com/android/settings/development/DebugViewAttributesPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class DebugViewAttributesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 769f4dae4f364714974dfae5f82980779f4a1cb3..361e94ad577d0fde42ac226438debe75e57d6bff 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -28,8 +28,6 @@ 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; @@ -55,6 +53,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost, diff --git a/src/com/android/settings/development/DevelopmentSwitchBarController.java b/src/com/android/settings/development/DevelopmentSwitchBarController.java index 84b7f9f28650ffcb947cda663ea46ebda3d5d6bb..08ddc8690ecedc09b73118c476cfab216eb867a5 100644 --- a/src/com/android/settings/development/DevelopmentSwitchBarController.java +++ b/src/com/android/settings/development/DevelopmentSwitchBarController.java @@ -16,8 +16,6 @@ package com.android.settings.development; -import androidx.annotation.NonNull; - import com.android.settings.Utils; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -26,6 +24,8 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; import com.android.settingslib.development.DevelopmentSettingsEnabler; +import androidx.annotation.NonNull; + public class DevelopmentSwitchBarController implements LifecycleObserver, OnStart, OnStop { private final SwitchBar mSwitchBar; diff --git a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java index 5ecb67633dd725cd3d8e11fc278ee60a9e5631a3..a1ecfd4594d0a7eb2b9be86637012a97c9c328ef 100644 --- a/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java +++ b/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class DisableAutomaticUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java index 46b493fe046125b60de820b05bedf48e6ae624de..01687c63131368c1bbb458062e10eeec2e2c9fdc 100644 --- a/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java +++ b/src/com/android/settings/development/EmulateDisplayCutoutPreferenceController.java @@ -26,18 +26,18 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.text.TextUtils; import android.view.DisplayCutout; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; -import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class EmulateDisplayCutoutPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java index 86663682d62ce7fdb8a120f76dc9fd281c3ed2a6..5def536b43330cffc93fd372b6e05b7beca5fd8a 100644 --- a/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java +++ b/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceController.java @@ -18,13 +18,13 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class EnableGnssRawMeasFullTrackingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java index 9882975ff6bd002a09069349fb4ec290d9e35bff..2a7e94487a57cacc748420028a10e2645b7a698a 100644 --- a/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java +++ b/src/com/android/settings/development/EnableGpuDebugLayersPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class EnableGpuDebugLayersPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/FileEncryptionPreferenceController.java b/src/com/android/settings/development/FileEncryptionPreferenceController.java index f8326abf313a7c9dad94d0e4d4d2d5b4cbb96da1..2e57c2703821dbe29c7c31b008110e2fab2706b9 100644 --- a/src/com/android/settings/development/FileEncryptionPreferenceController.java +++ b/src/com/android/settings/development/FileEncryptionPreferenceController.java @@ -21,14 +21,15 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.os.storage.IStorageManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class FileEncryptionPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ForceMSAAPreferenceController.java b/src/com/android/settings/development/ForceMSAAPreferenceController.java index 17b5e4bdacab83c9462dd9e2d82c8f7c30bc92f2..dda03e03970a8756606dcaf08eaa93631d04121f 100644 --- a/src/com/android/settings/development/ForceMSAAPreferenceController.java +++ b/src/com/android/settings/development/ForceMSAAPreferenceController.java @@ -18,14 +18,15 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ForceMSAAPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/FreeformWindowsPreferenceController.java b/src/com/android/settings/development/FreeformWindowsPreferenceController.java index e6c3813d448c369de08b780a4c47904f81581630..ec63b6c79902c768c06d346269d6c695b2e630ca 100644 --- a/src/com/android/settings/development/FreeformWindowsPreferenceController.java +++ b/src/com/android/settings/development/FreeformWindowsPreferenceController.java @@ -19,14 +19,15 @@ 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 android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class FreeformWindowsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java index a7613763a798c9961307153b02073765a6a8e93e..7986d363103528442f43c3dea541ce3e209e2b87 100644 --- a/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/GlobalSettingSwitchPreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Base controller for Switch preference that maps to a specific value in Settings.Global. */ diff --git a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java index 6b8ead5f5e29f453d2ffce6e823418454a6540fa..5b54bd700270ff62f14e25e4051dd276ebb51c7f 100644 --- a/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java +++ b/src/com/android/settings/development/GpuViewUpdatesPreferenceController.java @@ -18,14 +18,15 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class GpuViewUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java index 4c501b6fb77f3228e835648e9445db9d55f7dadb..0dd5627083ec69e5a8a9ab755b3510e324824a39 100644 --- a/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java +++ b/src/com/android/settings/development/HardwareLayersUpdatesPreferenceController.java @@ -18,14 +18,15 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class HardwareLayersUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java index 69f1ba1003e6364c48f3cf209795776e90dc4e00..b299f93136fe3c2e1f5d155a0c32639e773d26e0 100644 --- a/src/com/android/settings/development/HardwareOverlaysPreferenceController.java +++ b/src/com/android/settings/development/HardwareOverlaysPreferenceController.java @@ -21,13 +21,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class HardwareOverlaysPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/HdcpCheckingPreferenceController.java b/src/com/android/settings/development/HdcpCheckingPreferenceController.java index 6dcca77520919f53adc631137b48b60ac09a3361..f268978351c10fffbafb85fdd70fc1831aa87271 100644 --- a/src/com/android/settings/development/HdcpCheckingPreferenceController.java +++ b/src/com/android/settings/development/HdcpCheckingPreferenceController.java @@ -19,9 +19,6 @@ package com.android.settings.development; import android.content.Context; import android.os.Build; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.R; @@ -29,6 +26,10 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class HdcpCheckingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/KeepActivitiesPreferenceController.java b/src/com/android/settings/development/KeepActivitiesPreferenceController.java index 839397b68e99af1435388abd2f97fd811672e904..90762232259b4155330851fb140b65885060b269 100644 --- a/src/com/android/settings/development/KeepActivitiesPreferenceController.java +++ b/src/com/android/settings/development/KeepActivitiesPreferenceController.java @@ -21,14 +21,15 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class KeepActivitiesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java index 18e3a061cd856254bf6d43096da3055c22ad251d..2358a64900847e810e7d23b2a1c6f8038ee35fcf 100644 --- a/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java +++ b/src/com/android/settings/development/LocalBackupPasswordPreferenceController.java @@ -21,13 +21,14 @@ import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class LocalBackupPasswordPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LocalTerminalPreferenceController.java b/src/com/android/settings/development/LocalTerminalPreferenceController.java index 362b97b2f01a306b8e6be3411a682f2f6cd8c280..7ffd92dd5647c1045869e38bf9b5ea07e37bf565 100644 --- a/src/com/android/settings/development/LocalTerminalPreferenceController.java +++ b/src/com/android/settings/development/LocalTerminalPreferenceController.java @@ -3,14 +3,15 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class LocalTerminalPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LogPersistPreferenceController.java b/src/com/android/settings/development/LogPersistPreferenceController.java index 9c7a0378cb3c2d30bdbd5ec1a27ffac116e09f00..0cb09e82b65bcafc9c9e5b7579616b8dc6cb71db 100644 --- a/src/com/android/settings/development/LogPersistPreferenceController.java +++ b/src/com/android/settings/development/LogPersistPreferenceController.java @@ -17,13 +17,14 @@ package com.android.settings.development; import android.content.Context; -import androidx.annotation.Nullable; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.development.AbstractLogpersistPreferenceController; +import androidx.annotation.Nullable; +import androidx.preference.Preference; + public class LogPersistPreferenceController extends AbstractLogpersistPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/LogdSizePreferenceController.java b/src/com/android/settings/development/LogdSizePreferenceController.java index cae07668471f14d2988de24cb19cef4b7dfdb79b..f4120c628daf2645006a4a58b8180711c6748e1c 100644 --- a/src/com/android/settings/development/LogdSizePreferenceController.java +++ b/src/com/android/settings/development/LogdSizePreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.development; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.AbstractLogdSizePreferenceController; +import androidx.preference.Preference; + public class LogdSizePreferenceController extends AbstractLogdSizePreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/MemoryUsagePreferenceController.java b/src/com/android/settings/development/MemoryUsagePreferenceController.java index 84120797c34c47620580b0b25460a1156d85798c..9a7d6b11c5698c1f6442bafab0cb1949049cfd41 100644 --- a/src/com/android/settings/development/MemoryUsagePreferenceController.java +++ b/src/com/android/settings/development/MemoryUsagePreferenceController.java @@ -17,9 +17,6 @@ package com.android.settings.development; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.format.Formatter; import com.android.settings.R; @@ -29,6 +26,10 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.utils.ThreadUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class MemoryUsagePreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 031ff9efdd857727f395f026e18a9ef8bd8ef798..21d6e4e3c89ef28753d4f2d13c6fd6f66a3771d6 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class MobileDataAlwaysOnPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/MockLocationAppPreferenceController.java b/src/com/android/settings/development/MockLocationAppPreferenceController.java index 65640599aa5b0070124e0ee4a58a9bee13a999ee..02ea1af721ed82af96f264340abedb546b77ba32 100644 --- a/src/com/android/settings/development/MockLocationAppPreferenceController.java +++ b/src/com/android/settings/development/MockLocationAppPreferenceController.java @@ -26,7 +26,6 @@ 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 com.android.settings.R; @@ -35,6 +34,8 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.List; +import androidx.preference.Preference; + public class MockLocationAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java index 5e159c65d57a3594cddac7736743cffea9f338f7..81373f38e1e62fc7ce45bc0a63b91e55ea0f6d64 100644 --- a/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java +++ b/src/com/android/settings/development/NotificationChannelWarningsPreferenceController.java @@ -19,13 +19,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class NotificationChannelWarningsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java index 243cd3f281fa81e5734571b23367b3da5b3e5704..c68750285edf5c861824a7b8e226efff958a8437 100644 --- a/src/com/android/settings/development/OemUnlockPreferenceController.java +++ b/src/com/android/settings/development/OemUnlockPreferenceController.java @@ -26,9 +26,6 @@ import android.content.res.Resources; import android.os.UserHandle; import android.os.UserManager; import android.service.oemlock.OemLockManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; @@ -37,6 +34,10 @@ import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class OemUnlockPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/PictureColorModePreferenceController.java b/src/com/android/settings/development/PictureColorModePreferenceController.java index fe07083e45d79d8843b39aa1c9ea8b2909f41bc1..20f2d9a5f7f2e45f38650223c66ca3e3183be658 100644 --- a/src/com/android/settings/development/PictureColorModePreferenceController.java +++ b/src/com/android/settings/development/PictureColorModePreferenceController.java @@ -17,8 +17,6 @@ package com.android.settings.development; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -27,6 +25,9 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + public class PictureColorModePreferenceController extends DeveloperOptionsPreferenceController implements LifecycleObserver, OnResume, OnPause, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/PointerLocationPreferenceController.java b/src/com/android/settings/development/PointerLocationPreferenceController.java index 079184c7dd7d039a33cb0e2d7192ed121d559968..15f56d1cede302e66bfa20e9c2973f61346b385e 100644 --- a/src/com/android/settings/development/PointerLocationPreferenceController.java +++ b/src/com/android/settings/development/PointerLocationPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class PointerLocationPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java index ba9ce7746d3083aa4cf2b5dd564ebf4ab2ad3a43..bb4182e1f331306986c27d3067ddccbfffc70b7e 100644 --- a/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java +++ b/src/com/android/settings/development/ProfileGpuRenderingPreferenceController.java @@ -18,8 +18,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class ProfileGpuRenderingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ResizableActivityPreferenceController.java b/src/com/android/settings/development/ResizableActivityPreferenceController.java index 9ae9216402ed8acb67b8a1a1c3f71a3b6e37da7a..e1682264b80f279b26ed35ab8fe7d3291703081d 100644 --- a/src/com/android/settings/development/ResizableActivityPreferenceController.java +++ b/src/com/android/settings/development/ResizableActivityPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ResizableActivityPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/RtlLayoutPreferenceController.java b/src/com/android/settings/development/RtlLayoutPreferenceController.java index a88f16f90bd39bc89368a2d7c65294e420b55f3c..892ea4ea12bb39b49342e36ae75b6528aeaa2af9 100644 --- a/src/com/android/settings/development/RtlLayoutPreferenceController.java +++ b/src/com/android/settings/development/RtlLayoutPreferenceController.java @@ -19,14 +19,15 @@ 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 com.android.internal.app.LocalePicker; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class RtlLayoutPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java index 21f9881ec0bc638dfaa8154f949c23627694a441..749658562bc5c503be1f41048c1ec8269b42bd3d 100644 --- a/src/com/android/settings/development/SecondaryDisplayPreferenceController.java +++ b/src/com/android/settings/development/SecondaryDisplayPreferenceController.java @@ -18,14 +18,15 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class SecondaryDisplayPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java index 8974c0a8ef9813760d80497abeefa69ad8359060..029509d9cd0657a44f115eae838a57a40ef31f16 100644 --- a/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SecureSettingSwitchPreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Base controller for Switch preference that maps to a specific value in Settings.Secure. */ diff --git a/src/com/android/settings/development/SelectDebugAppPreferenceController.java b/src/com/android/settings/development/SelectDebugAppPreferenceController.java index 82a67963f88dd4e6e842dd0fc7cd883a3228c8fd..7f92a346cbe4b3d9c46a3092ee08c751021d817e 100644 --- a/src/com/android/settings/development/SelectDebugAppPreferenceController.java +++ b/src/com/android/settings/development/SelectDebugAppPreferenceController.java @@ -25,13 +25,14 @@ 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; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class SelectDebugAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java index f7f5b6ddd1456bfbef51a9f35634b0a16402e3a1..b7df198a39f14d12f59cef8f0261bec90db16c54 100644 --- a/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java +++ b/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceController.java @@ -20,7 +20,6 @@ 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; @@ -29,6 +28,8 @@ import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; + public class ShortcutManagerThrottlingPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java index d0df9c8d3a0b92ec59169c060a30e15e42a9ffa5..f876c5428f413e3b1b90e32212b113eadcf8f6b0 100644 --- a/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java +++ b/src/com/android/settings/development/ShowFirstCrashDialogPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ShowFirstCrashDialogPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java index 4d3fdbf6ca789d28d04d022d63de75eb4d2f1af7..ac412c78a24c93e3466440f3986d87603fe1c8b0 100644 --- a/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java +++ b/src/com/android/settings/development/ShowLayoutBoundsPreferenceController.java @@ -18,14 +18,15 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; import com.android.settingslib.development.SystemPropPoker; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ShowLayoutBoundsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java index ffd3da27cd118bb72e5386349941473945b4eecd..4a03fb53c2e12b442120c6f5bb33cdf802c689c9 100644 --- a/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java +++ b/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceController.java @@ -21,13 +21,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ShowSurfaceUpdatesPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/ShowTapsPreferenceController.java b/src/com/android/settings/development/ShowTapsPreferenceController.java index 87fbf6928b5a7519acea2c2e349c25cf4414e796..08596eee8cc5f99ef52ef7c10211f831ea972dd7 100644 --- a/src/com/android/settings/development/ShowTapsPreferenceController.java +++ b/src/com/android/settings/development/ShowTapsPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ShowTapsPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java index ed16b685b78e8aa7d12cecc453d47449736164fa..2d813fd71d98478e60997f81165caef3779e180c 100644 --- a/src/com/android/settings/development/SimulateColorSpacePreferenceController.java +++ b/src/com/android/settings/development/SimulateColorSpacePreferenceController.java @@ -20,15 +20,16 @@ import android.content.ContentResolver; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -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; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class SimulateColorSpacePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/StayAwakePreferenceController.java b/src/com/android/settings/development/StayAwakePreferenceController.java index 31eb71aff88425aead5aefdb1388ee9230416297..1bea6d34fe589495d24485257fd04d423942a8e6 100644 --- a/src/com/android/settings/development/StayAwakePreferenceController.java +++ b/src/com/android/settings/development/StayAwakePreferenceController.java @@ -23,9 +23,6 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; @@ -36,6 +33,10 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class StayAwakePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause, diff --git a/src/com/android/settings/development/StrictModePreferenceController.java b/src/com/android/settings/development/StrictModePreferenceController.java index 2af301c0d6d87aac40834d559f28ac15f25989f2..f1ec81b8f0f45fc9f8296c03cddd829d581ce1e2 100644 --- a/src/com/android/settings/development/StrictModePreferenceController.java +++ b/src/com/android/settings/development/StrictModePreferenceController.java @@ -21,14 +21,15 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.StrictMode; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.view.IWindowManager; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class StrictModePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java index 7174b457e0b63dc6edd802ea9c8f7ed312d8632b..09263a127e87b59f68721f3f3d342e18ae1ab7e9 100644 --- a/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java +++ b/src/com/android/settings/development/SystemSettingSwitchPreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.development; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Base controller for Switch preference that maps to a specific value in Settings.System. */ diff --git a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java index 72b0bf3a31f4e912035611eaa33a9a2a348e3367..1277602409815d68ca84ca66a3c9cf4052a5a085 100644 --- a/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java +++ b/src/com/android/settings/development/TetheringHardwareAccelPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class TetheringHardwareAccelPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java index 6f57f88834069ec07900a6642ddfa2c16c2ace8f..a6859a14778153e74504a3ce16f023856edbf552 100644 --- a/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/TransitionAnimationScalePreferenceController.java @@ -19,15 +19,16 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; -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; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class TransitionAnimationScalePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java index c73412dbb3597357da3294b87442499adc4260f9..0c1bf2543dbfa92255b5ff1c17d6dfabcd9247ef 100644 --- a/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java +++ b/src/com/android/settings/development/UsbAudioRoutingPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class UsbAudioRoutingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java index 4e853034a8ae22e9bdbc4df8bf6d5b2f4b1de700..b396f2d3003c9951f0186f4c1365efa9e615aa89 100644 --- a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java +++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java @@ -23,8 +23,6 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedLockUtils; @@ -34,6 +32,9 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller to manage the state of "Verify apps over USB" toggle. */ diff --git a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java index 9959f12ce1a153649b77dff794c5840065b93274..268def27b41d066a1d2bc5e865cdbc84a06faa52 100644 --- a/src/com/android/settings/development/WaitForDebuggerPreferenceController.java +++ b/src/com/android/settings/development/WaitForDebuggerPreferenceController.java @@ -26,14 +26,15 @@ import android.content.Context; import android.content.Intent; import android.os.RemoteException; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class WaitForDebuggerPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin, OnActivityResultListener { diff --git a/src/com/android/settings/development/WebViewAppPreferenceController.java b/src/com/android/settings/development/WebViewAppPreferenceController.java index 98e6319b98a527a9384f87e8a980a62117ac13a0..70eb33bfad2f4ab8a80f8c2cb95b6c238154fcfd 100644 --- a/src/com/android/settings/development/WebViewAppPreferenceController.java +++ b/src/com/android/settings/development/WebViewAppPreferenceController.java @@ -18,9 +18,6 @@ package com.android.settings.development; import android.content.Context; import android.content.pm.PackageInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - import android.content.pm.PackageManager; import android.text.TextUtils; import android.util.Log; @@ -31,6 +28,9 @@ import com.android.settings.webview.WebViewUpdateServiceWrapper; import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class WebViewAppPreferenceController extends DeveloperOptionsPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java index 9582ebe4ad3b65c12f1a9756a383ed2ac07d0781..2497ef4f093922ed3ce41e9c97a4d105db769cd3 100644 --- a/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java +++ b/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceController.java @@ -18,14 +18,15 @@ 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 com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class WifiConnectedMacRandomizationPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java index 71ca8f1956d661bf1426f5bc187b23b869394e48..bfd77c472dad769e2188187ddfb5ab11df68c02e 100644 --- a/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java +++ b/src/com/android/settings/development/WifiDisplayCertificationPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class WifiDisplayCertificationPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java index c3c9ca3ec139bb1121fc50fac2dbd7bc75f7c818..dd995618aee73280b301c7dc3de7b8d32784ba57 100644 --- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java +++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { diff --git a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java index 6414372470d0999b80f01886d0f3d5d91474d533..7c373e73461d77fc733f9e63e5ba2bc5f9a0a38f 100644 --- a/src/com/android/settings/development/WindowAnimationScalePreferenceController.java +++ b/src/com/android/settings/development/WindowAnimationScalePreferenceController.java @@ -19,15 +19,16 @@ package com.android.settings.development; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; -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; import com.android.settingslib.development.DeveloperOptionsPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class WindowAnimationScalePreferenceController extends DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener, 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..33ee3b76a25cab5bcc9bf3fcba0afa32470a770c 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.development.featureflags; import android.content.Context; -import androidx.preference.PreferenceScreen; import android.util.FeatureFlagUtils; import com.android.settings.core.PreferenceControllerMixin; @@ -28,6 +27,8 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.Map; +import androidx.preference.PreferenceScreen; + public class FeatureFlagsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart { diff --git a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java index 71d3d07888e3227527458655c06272ebe244d730..7834aa95ef9fcd11f2206d282c2020b125e2dabb 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java +++ b/src/com/android/settings/development/qstile/DevelopmentTilePreferenceController.java @@ -25,10 +25,6 @@ import android.content.pm.ServiceInfo; import android.os.RemoteException; import android.os.ServiceManager; import android.service.quicksettings.TileService; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import com.android.internal.statusbar.IStatusBarService; @@ -36,6 +32,11 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class DevelopmentTilePreferenceController extends AbstractPreferenceController { private static final String TAG = "DevTilePrefController"; diff --git a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java index ca2d9cff8ace89ccfe464a897c9d965b445b2c13..6f6327996cad6296219b5bcd19d8075ff6c99cab 100644 --- a/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java @@ -19,8 +19,6 @@ 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; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -30,6 +28,9 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.core.SubSettingLauncher; import com.android.settings.overlay.FeatureFactory; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class BrandedAccountPreferenceController extends BasePreferenceController { private static final String KEY_PREFERENCE_TITLE = "branded_account"; private final Account[] mAccounts; diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java index 707d660b2c8e542602b93058f00492d36a41c5dd..f3be9e25041539f2eedef4440b29911988dc4f65 100644 --- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java +++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java @@ -25,8 +25,6 @@ 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; @@ -46,6 +44,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.development.DevelopmentSettingsEnabler; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class BuildNumberPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume { diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java index fc89dc19420e9d8f37cced2548d2168d285f06f7..0d4df99505844a637d0c58dbcb0b55d6a37fa4b8 100644 --- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java +++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java @@ -23,23 +23,21 @@ 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 com.android.settings.bluetooth.BluetoothLengthDeviceNameFilter; import com.android.settings.core.BasePreferenceController; 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; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class DeviceNamePreferenceController extends BasePreferenceController implements ValidatedEditTextPreference.Validator, Preference.OnPreferenceChangeListener, diff --git a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java index 62077ca2b1427d42a90584f3a4e14af213697a1e..4a2ad243ff1456922264a7004bca80946011a972 100644 --- a/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceController.java @@ -17,14 +17,15 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class FccEquipmentIdPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java index 52721821a417a0c60d7cd7b5e74cf10d28a2d7f7..169b6bbfa1e80dd72ea12f735fc8bbdb57a8499a 100644 --- a/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java +++ b/src/com/android/settings/deviceinfo/FeedbackPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class FeedbackPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private static final String KEY_DEVICE_FEEDBACK = "device_feedback"; diff --git a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java index 58155af1ca5e925153a33d6f7c857df8ebd6844b..51964a937375dfcd6d9d723d14883a0ce26f0082 100644 --- a/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/HardwareInfoDialogFragment.java @@ -21,7 +21,6 @@ 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; @@ -31,6 +30,8 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.annotation.VisibleForTesting; + public class HardwareInfoDialogFragment extends InstrumentedDialogFragment { public static final String TAG = "HardwareInfo"; 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..4824a4b40cc96cd35834b7e976f6f8c60f17ac19 100644 --- a/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/KernelVersionPreferenceController.java @@ -16,12 +16,13 @@ package com.android.settings.deviceinfo; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.DeviceInfoUtils; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class KernelVersionPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java b/src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java index 95cd09c39542d973689f432d40dff7dc7784e9a3..83138f9c0850e58fe4b2fa8a1e80c7d3865e0a9d 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; @@ -35,6 +32,10 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class PhoneNumberPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java index b5aabeb78aaf6d297c83c2c5a25e5cc169112a83..d9cbc60b1011acf9d5b7ba88bc1ca33dc917d7ce 100644 --- a/src/com/android/settings/deviceinfo/PrivateVolumeForget.java +++ b/src/com/android/settings/deviceinfo/PrivateVolumeForget.java @@ -24,7 +24,6 @@ import android.content.DialogInterface; import android.os.Bundle; import android.os.storage.StorageManager; import android.os.storage.VolumeRecord; -import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; @@ -39,6 +38,8 @@ import com.android.settings.core.InstrumentedFragment; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.search.actionbar.SearchMenuController; +import androidx.annotation.VisibleForTesting; + public class PrivateVolumeForget extends InstrumentedFragment { @VisibleForTesting static final String TAG_FORGET_CONFIRM = "forget_confirm"; diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java index 1c3e12fec37908816302e9975fc70b636f4b5f8f..b248279e00dea0aacbedb5df38430b9ca2cd81f9 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; @@ -70,6 +66,11 @@ import java.util.HashMap; import java.util.List; import java.util.Objects; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PRIVATE} * storage volume. diff --git a/src/com/android/settings/deviceinfo/PublicVolumeSettings.java b/src/com/android/settings/deviceinfo/PublicVolumeSettings.java index 5982be68a284df774da2a60965f04e99baff7f34..70838ca101429048681d7988c6f825e56f21be65 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; @@ -47,6 +45,9 @@ import com.android.settings.deviceinfo.StorageSettings.UnmountTask; import java.io.File; import java.util.Objects; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Panel showing summary and actions for a {@link VolumeInfo#TYPE_PUBLIC} * storage volume. diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 64ac99c228df44fc1f0e96a670a263a8632d7032..395740c987bbcddfdd0cb25ae5696d59103743f8 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -28,7 +28,6 @@ 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; @@ -57,6 +56,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable public class StorageDashboardFragment extends DashboardFragment implements diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java index 6cf85b1fc2010e9886596bfe6b71022f986a575a..d20d21be00da295a23f1202702e845e0f086ac7a 100644 --- a/src/com/android/settings/deviceinfo/StorageItemPreference.java +++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java @@ -18,15 +18,15 @@ 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 com.android.settings.R; import com.android.settings.utils.FileSizeFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class StorageItemPreference extends Preference { public int userHandle; diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index 27e7fd175c01b4fc96cbcc63dda31d2e00d0c10e..29b838b87d680de83448ecd8f6e3158bd985e7f3 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -24,7 +24,6 @@ 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 com.android.internal.logging.nano.MetricsProto; @@ -41,6 +40,8 @@ import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * StorageProfileFragment is a fragment which shows the storage results for a profile of the * primary user. diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java index 3c030326b2fcb4cecadf84feac6ae7541f404033..a4e900b3b5b287c10ff60127bc88202540bddc32 100644 --- a/src/com/android/settings/deviceinfo/StorageSettings.java +++ b/src/com/android/settings/deviceinfo/StorageSettings.java @@ -35,10 +35,6 @@ 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; @@ -64,6 +60,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + /** * Panel showing both internal storage (both built-in storage and private * volumes) and removable storage (public volumes). diff --git a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java index 292ee44be16bef1e9f916ee71a2f26ca57afb014..481e0444cbb2ea1db1761ad12b4402d7654016ee 100644 --- a/src/com/android/settings/deviceinfo/StorageSummaryPreference.java +++ b/src/com/android/settings/deviceinfo/StorageSummaryPreference.java @@ -18,8 +18,6 @@ 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; @@ -27,6 +25,9 @@ import android.widget.TextView; import com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class StorageSummaryPreference extends Preference { private int mPercent = -1; 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 7aa71387e7996e67d270dd72cb2855eade089b01..db5339d4aaa7cbe6372d02eae1ff072e55af71cb 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; @@ -36,8 +34,11 @@ 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; + +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; /** * Preference line representing a single {@link VolumeInfo}, possibly including diff --git a/src/com/android/settings/deviceinfo/StorageWizardBase.java b/src/com/android/settings/deviceinfo/StorageWizardBase.java index 47481f38c866ea8413c9fbe881a845a98408b208..cae39e23f199349cf40d3dd263fea32b5ee783eb 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardBase.java +++ b/src/com/android/settings/deviceinfo/StorageWizardBase.java @@ -18,7 +18,6 @@ package com.android.settings.deviceinfo; import static android.os.storage.DiskInfo.EXTRA_DISK_ID; import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID; - import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.annotation.LayoutRes; diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java index 7173f08e1f00c0b4b76b8243744d91a021f1fa9b..51e17c67612b846854e92faa7576c78f5dda0fd2 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatConfirm.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static android.os.storage.DiskInfo.EXTRA_DISK_ID; - import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_FORGET_UUID; import static com.android.settings.deviceinfo.StorageWizardBase.EXTRA_FORMAT_PRIVATE; diff --git a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java index 3d654ef5c544dab706cf8cc53681f76559eeeb17..d7949a22d94ddc0d854b433bb23baa93229f371c 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardFormatProgress.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static android.os.storage.VolumeInfo.TYPE_PRIVATE; - import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.Intent; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java index 60f3cb5d4cba91385cc7e5fa1c2b646234df4d3d..f15665f77ebecebb3746d42e7f12c82143bde63e 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateProgress.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static android.content.pm.PackageManager.EXTRA_MOVE_ID; - import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.Context; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java index 10b78af0d7a3bcf85aefb25164ff619b6a5e5a05..214f0c291bd141d72469d1e0315f92358170e612 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java @@ -20,7 +20,6 @@ import static android.content.Intent.EXTRA_PACKAGE_NAME; import static android.content.Intent.EXTRA_TITLE; import static android.content.pm.PackageManager.EXTRA_MOVE_ID; import static android.os.storage.VolumeInfo.EXTRA_VOLUME_ID; - import static com.android.settings.deviceinfo.StorageSettings.TAG; import android.content.Intent; diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java index 1f393c5128ea5e879c2c65c0330982f3578481b4..a0185e4637326f36512022439ece110b4ac55b81 100644 --- a/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java +++ b/src/com/android/settings/deviceinfo/StorageWizardMoveProgress.java @@ -16,20 +16,19 @@ 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..0f7f2e94ad5cbff4b7a08d89e6b94242750b0356 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionDialogController.java @@ -18,11 +18,12 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.os.SystemProperties; -import androidx.annotation.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; +import androidx.annotation.VisibleForTesting; + public class BasebandVersionDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java index 6dc651abad15fc37a719145cf83c9fc28e4e5bdf..b8e18858adc6005f58846fd50ca200ac88e97f05 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BuildNumberDialogController.java @@ -17,11 +17,12 @@ package com.android.settings.deviceinfo.firmwareversion; import android.os.Build; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import com.android.settings.R; +import androidx.annotation.VisibleForTesting; + public class BuildNumberDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java index 277024576a818e4890f7d0b2cc2505e1a75898b6..e43091dc4b58bf134ef9f14e1ed9142ee06cfc47 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/FirmwareVersionDialogController.java @@ -22,13 +22,14 @@ 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 com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; +import androidx.annotation.VisibleForTesting; + public class FirmwareVersionDialogController implements View.OnClickListener { private static final String TAG = "firmwareDialogCtrl"; diff --git a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java index 0d816d563e8fc1bcf14ca914f3165945c6ae5f80..36ebc395a50de0677398644bb4c12487ee6ee8da 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/KernelVersionDialogController.java @@ -16,11 +16,11 @@ package com.android.settings.deviceinfo.firmwareversion; -import androidx.annotation.VisibleForTesting; - import com.android.settings.R; import com.android.settingslib.DeviceInfoUtils; +import androidx.annotation.VisibleForTesting; + public class KernelVersionDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index 415788663c178044330b537c06c87df1b4d21881..a7b8a7a9af9163214eede72f78138937b21c7782 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; @@ -34,6 +32,9 @@ import com.android.settings.R; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class ImeiInfoDialogController { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java index 3cc90e482931979bbdf3e9f080229b76d699e1f3..db68a5f4e06c0a134b81371408d1eebb7399f10f 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogFragment.java @@ -21,8 +21,6 @@ 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; @@ -32,6 +30,9 @@ import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class ImeiInfoDialogFragment extends InstrumentedDialogFragment { @VisibleForTesting diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java index d673a280274650174b30d2f2c590a5b2531686ec..043773e8679eeb5486a71f2bab871a0b67904bd6 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceController.java @@ -20,9 +20,6 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.app.Fragment; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; @@ -32,6 +29,10 @@ import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceCon import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Controller that manages preference for single and multi sim devices. */ diff --git a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java index 0d81c130f910e8900e204cdcde46fe222e906d1f..6a67e4b7d6243498aebd5957065a033e985df40d 100644 --- a/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java +++ b/src/com/android/settings/deviceinfo/legal/LegalPreferenceController.java @@ -19,13 +19,14 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class LegalPreferenceController extends BasePreferenceController { private final PackageManager mPackageManager; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 114e4e449aa8d4ec080e802718531659181e887e..121bc03cf086d78dbb863039faa915005fda24fd 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; @@ -55,6 +53,9 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class SimStatusDialogController implements LifecycleObserver, OnResume, OnPause { private final static String TAG = "SimStatusDialogCtrl"; diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java index 3f714712a0800e674487e6b1a77a79615dab953b..e80434be46df3f6c848e6cd609e1c8d34741a40b 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceController.java @@ -18,9 +18,6 @@ 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; @@ -32,6 +29,10 @@ import com.android.settingslib.deviceinfo.AbstractSimStatusImeiInfoPreferenceCon import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class SimStatusPreferenceController extends AbstractSimStatusImeiInfoPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java index f07af5e56e098d8b5c133a91c46b49c863a05744..f6eea3dbfc6f4d871f537abbb490d0c5f8136c58 100644 --- a/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java +++ b/src/com/android/settings/deviceinfo/storage/CachedStorageValuesHelper.java @@ -19,7 +19,6 @@ 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 com.android.settingslib.applications.StorageStatsSource; @@ -27,6 +26,8 @@ import com.android.settingslib.deviceinfo.PrivateStorageInfo; import java.util.concurrent.TimeUnit; +import androidx.annotation.VisibleForTesting; + public class CachedStorageValuesHelper { @VisibleForTesting public static final String SHARED_PREFERENCES_NAME = "CachedStorageValues"; diff --git a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java index 1eccb67f5483fd49520f28d83d7f8a7956660b04..67d70e6ec2e55b13f3a8d3449098f0977213d0d7 100644 --- a/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java +++ b/src/com/android/settings/deviceinfo/storage/SecondaryUserController.java @@ -20,11 +20,6 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -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; @@ -35,6 +30,12 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * SecondaryUserController controls the preferences on the Storage screen which had to do with * secondary users. diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java index 0272b5c6dfa8ddb38260e80d359e29bb3343e674..b7dc24f1b259c0be9e0a889b97297e7720a944fa 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java @@ -26,9 +26,6 @@ import android.net.TrafficStats; import android.os.Bundle; import android.os.UserHandle; import android.os.storage.VolumeInfo; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.util.SparseArray; @@ -50,6 +47,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * StorageItemPreferenceController handles the storage line items which summarize the storage * categorization breakdown. diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java index 813261f50b3d7be657b7c7275181180dd7db044d..bf29612a830ffdd0665002ed7507a3d50468c1a8 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreference.java @@ -20,27 +20,19 @@ 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 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; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; /** * StorageSummaryDonutPreference is a preference which summarizes the used and remaining storage left diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java index f4c33be5ae3d5c58c1a5eb47a351ca7fd58a6346..8e188d8986a30cb607e50784bc40e9c1f95c4b3f 100644 --- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java +++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java @@ -18,8 +18,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.deviceinfo.StorageVolumeProvider; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * StorgaeSummaryPreferenceController updates the donut storage summary preference to have the * correct sizes showing. diff --git a/src/com/android/settings/deviceinfo/storage/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 85712947d1063845c2de21bf7358a874e095f74d..00cdc02da828e9068b4545b73ecb4427ce51d86f 100644 --- a/src/com/android/settings/deviceinfo/storage/UserProfileController.java +++ b/src/com/android/settings/deviceinfo/storage/UserProfileController.java @@ -21,8 +21,6 @@ import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.storage.VolumeInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.SparseArray; import com.android.internal.logging.nano.MetricsProto; @@ -34,6 +32,9 @@ import com.android.settings.deviceinfo.StorageItemPreference; import com.android.settings.deviceinfo.StorageProfileFragment; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Defines a {@link AbstractPreferenceController} which handles a single profile of the primary * user. diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java index a9b047c58b458522ffcae228f5f8b58e0f2868dd..844c195385b935103eb1160c1d2abe690c4392de 100644 --- a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java +++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java @@ -19,7 +19,6 @@ 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; import com.android.settingslib.deviceinfo.StorageVolumeProvider; @@ -27,6 +26,8 @@ import com.android.settingslib.utils.AsyncLoader; import java.io.IOException; +import androidx.annotation.VisibleForTesting; + public class VolumeSizesLoader extends AsyncLoader { private StorageVolumeProvider mVolumeProvider; private StorageStatsManager mStats; 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..4c02cd6431dc23c84192a28add4e546fc18f7e88 100644 --- a/src/com/android/settings/display/AutoRotatePreferenceController.java +++ b/src/com/android/settings/display/AutoRotatePreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto; @@ -27,6 +26,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.Preference; + public class AutoRotatePreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 632e3390703636c9a0a69b02338ca1a466457147..1840d85369bc27b4494cb1f503db5aa94cdd5e40 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -15,15 +15,16 @@ */ 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; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; /** * A controller to manage the switch for showing battery percentage in the status bar. diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index be79f66b55680c33c3d6e5943569c591c64ecead..5fd29d1ad14744d5aab5875ac41294e73620f15c 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -28,9 +28,6 @@ import android.os.ServiceManager; import android.provider.Settings; import android.provider.Settings.System; import android.service.vr.IVrManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; @@ -42,6 +39,10 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.text.NumberFormat; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/display/CameraGesturePreferenceController.java b/src/com/android/settings/display/CameraGesturePreferenceController.java index 9b1b2c296c4ae797500ace7a9f8d630feb3ec83f..dddc02696c44a8222489f0ab41d50ac78e8865a7 100644 --- a/src/com/android/settings/display/CameraGesturePreferenceController.java +++ b/src/com/android/settings/display/CameraGesturePreferenceController.java @@ -13,16 +13,17 @@ */ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; 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 874dc71e80dfcd376fde131719c22573d17a68a2..9b9f8bd5422e42333db188310ad1ea869f24711b 100644 --- a/src/com/android/settings/display/ColorModePreferenceFragment.java +++ b/src/com/android/settings/display/ColorModePreferenceFragment.java @@ -17,14 +17,10 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; - import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; - -import com.android.settings.applications.LayoutPreference; import com.android.settings.R; +import com.android.settings.applications.LayoutPreference; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; import com.android.settings.widget.RadioButtonPickerFragment; @@ -35,6 +31,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; + @SuppressWarnings("WeakerAccess") @SearchIndexable public class ColorModePreferenceFragment extends RadioButtonPickerFragment diff --git a/src/com/android/settings/display/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..e5462581c3e50d4964ccda3c0b4ac37aba7bbf6b 100644 --- a/src/com/android/settings/display/LiftToWakePreferenceController.java +++ b/src/com/android/settings/display/LiftToWakePreferenceController.java @@ -13,17 +13,18 @@ */ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; -import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; 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..e988e3026f03bd5be42a3ecf48a23afdd73074ca 100644 --- a/src/com/android/settings/display/NightDisplayActivationPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayActivationPreferenceController.java @@ -17,17 +17,19 @@ 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 com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.TogglePreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class NightDisplayActivationPreferenceController extends TogglePreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java index bb42c857a7e7c7242b6c894d33c7b9d35d89aaec..6ccec7f00891c0354ad91c55bf705a78592b1e58 100644 --- a/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayAutoModePreferenceController.java @@ -17,13 +17,15 @@ 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; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class NightDisplayAutoModePreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java index 1eebb6be5ae25a74f96bf77e584f5e2b38f0c542..cb2adc7ce48cb2cdca70259f160b8a5c824d541d 100644 --- a/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomEndTimePreferenceController.java @@ -17,10 +17,12 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; +import androidx.preference.Preference; + public class NightDisplayCustomEndTimePreferenceController extends BasePreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java index 19297b82f32d1600830f36df45a418f1dfe4d8d7..75e8b8c55fbb2460cdfeb49952df814a3a5c48e7 100644 --- a/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java +++ b/src/com/android/settings/display/NightDisplayCustomStartTimePreferenceController.java @@ -17,10 +17,12 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.core.BasePreferenceController; +import androidx.preference.Preference; + public class NightDisplayCustomStartTimePreferenceController extends BasePreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java index 2075cfca322f806569065cb3b238150cad2cd891..7465b489c9b3aa54a1f438c669c971dec79d111c 100644 --- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java @@ -17,12 +17,14 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; + import com.android.internal.app.ColorDisplayController; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.widget.FooterPreference; +import androidx.preference.Preference; + public class NightDisplayFooterPreferenceController extends BasePreferenceController { public NightDisplayFooterPreferenceController(Context context) { diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java index 048e08472b7da13e8a6d2dd7932e60e35608cf07..003accc418041c4c8af63cd66b01933a6620bceb 100644 --- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java +++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java @@ -16,9 +16,6 @@ package com.android.settings.display; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import android.content.Context; import android.text.TextUtils; @@ -26,6 +23,9 @@ import com.android.internal.app.ColorDisplayController; import com.android.settings.core.SliderPreferenceController; import com.android.settings.widget.SeekBarPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class NightDisplayIntensityPreferenceController extends SliderPreferenceController { private ColorDisplayController mController; diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java index a1608d75e09e7ba01fc652fc1384f3f19ba49bf7..41c6b5383fca6c65e56956a4ed3c92a165de20bc 100644 --- a/src/com/android/settings/display/NightDisplayPreference.java +++ b/src/com/android/settings/display/NightDisplayPreference.java @@ -15,13 +15,14 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.SwitchPreference; import android.util.AttributeSet; import com.android.internal.app.ColorDisplayController; import java.time.LocalTime; +import androidx.preference.SwitchPreference; + public class NightDisplayPreference extends SwitchPreference implements ColorDisplayController.Callback { diff --git a/src/com/android/settings/display/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 f713617b3b833092a5bbccd5e57fb3b4e3059c43..d6fd54424ea130bf7b6e353c4321f1e5790254eb 100644 --- a/src/com/android/settings/display/NightDisplaySettings.java +++ b/src/com/android/settings/display/NightDisplaySettings.java @@ -21,7 +21,6 @@ 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; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -36,6 +35,8 @@ import java.time.LocalTime; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + /** * Settings screen for Night display. */ diff --git a/src/com/android/settings/display/NightModePreferenceController.java b/src/com/android/settings/display/NightModePreferenceController.java index 41620ea4704cec6ab27ba25e53160c3b3ceb2e41..65120e7891ef4de3014dce2bf0c32cac68ffee22 100644 --- a/src/com/android/settings/display/NightModePreferenceController.java +++ b/src/com/android/settings/display/NightModePreferenceController.java @@ -17,14 +17,15 @@ import static android.content.Context.UI_MODE_SERVICE; import android.app.UiModeManager; import android.content.Context; -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; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class NightModePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/ScreenSaverPreferenceController.java b/src/com/android/settings/display/ScreenSaverPreferenceController.java index ae44bf3e182bc2528294345ad26ec0d9289e2189..a172a3945753f43db45406b9d5af494d67edf127 100644 --- a/src/com/android/settings/display/ScreenSaverPreferenceController.java +++ b/src/com/android/settings/display/ScreenSaverPreferenceController.java @@ -14,12 +14,13 @@ package com.android.settings.display; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.dream.DreamSettings; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class ScreenSaverPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/ScreenZoomPreference.java b/src/com/android/settings/display/ScreenZoomPreference.java index 8451a2d4e3fa5fb4af933f5a281ac48728217d2a..6e4018149277eb194121ed342bc456a6685c19e4 100644 --- a/src/com/android/settings/display/ScreenZoomPreference.java +++ b/src/com/android/settings/display/ScreenZoomPreference.java @@ -17,13 +17,14 @@ 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 com.android.settingslib.display.DisplayDensityUtils; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; + /** * Preference for changing the density of the display on which the preference * is visible. diff --git a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java index cdb89fb4e11dac3e5f941708fcd0e52ac45fe7b6..7af3351ad371c24c3be6b2e4e005e1252e93708d 100644 --- a/src/com/android/settings/display/ShowOperatorNamePreferenceController.java +++ b/src/com/android/settings/display/ShowOperatorNamePreferenceController.java @@ -15,13 +15,14 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ShowOperatorNamePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/TapToWakePreferenceController.java b/src/com/android/settings/display/TapToWakePreferenceController.java index ff149ba838ae9f730bff52c5f40da784b1988b6f..da8e78564d1229f1a2ce28d4fd4c72f5cc0df4bd 100644 --- a/src/com/android/settings/display/TapToWakePreferenceController.java +++ b/src/com/android/settings/display/TapToWakePreferenceController.java @@ -15,12 +15,13 @@ package com.android.settings.display; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class TapToWakePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java index b2a638ecdeb5594284f1299029bc21ba9991f8cb..2beed89124df035e6724d287858d46e1c1451a51 100644 --- a/src/com/android/settings/display/TimeoutPreferenceController.java +++ b/src/com/android/settings/display/TimeoutPreferenceController.java @@ -20,7 +20,6 @@ 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 com.android.settings.R; @@ -30,6 +29,8 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class TimeoutPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/display/VrDisplayPreferenceController.java b/src/com/android/settings/display/VrDisplayPreferenceController.java index 9ff2861daedad9dd02ff85465cf04dbfd9c141d0..1c9562c75da742773206367505b51318b3400404 100644 --- a/src/com/android/settings/display/VrDisplayPreferenceController.java +++ b/src/com/android/settings/display/VrDisplayPreferenceController.java @@ -17,12 +17,13 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class VrDisplayPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java index 3c0e9476d8b4a255abcc4721f5006f8a486e8ff6..60068e3a33b5ded2911867e82c52901c6175880c 100644 --- a/src/com/android/settings/display/WallpaperPreferenceController.java +++ b/src/com/android/settings/display/WallpaperPreferenceController.java @@ -13,13 +13,14 @@ */ 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; @@ -29,10 +30,10 @@ 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; +import androidx.preference.Preference; + public class WallpaperPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { 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..00cf24baf5a127914ba5528da5fdacdfa1e0ac51 100644 --- a/src/com/android/settings/dream/CurrentDreamPreferenceController.java +++ b/src/com/android/settings/dream/CurrentDreamPreferenceController.java @@ -17,14 +17,17 @@ 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; +import androidx.preference.Preference; + public class CurrentDreamPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private final DreamBackend mBackend; diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index bb811620e6fefa6c42cb5e727318ac3c679d7db1..9c9566e3e774a1b4e58758304269c39568ca8e24 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -23,7 +23,6 @@ import static com.android.settingslib.dream.DreamBackend.WHILE_DOCKED; import android.content.Context; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -38,6 +37,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable public class DreamSettings extends DashboardFragment { diff --git a/src/com/android/settings/dream/StartNowPreferenceController.java b/src/com/android/settings/dream/StartNowPreferenceController.java index 0a6c1b67464a9e7401647ac08eaec39f5063e564..124e48575a916f246c58bfd99b6e947b7702b33c 100644 --- a/src/com/android/settings/dream/StartNowPreferenceController.java +++ b/src/com/android/settings/dream/StartNowPreferenceController.java @@ -17,15 +17,17 @@ package com.android.settings.dream; import android.content.Context; -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; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class StartNowPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { private static final String TAG = "StartNowPreferenceController"; diff --git a/src/com/android/settings/dream/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..b57d064994ed96720ff9a8d0a219e3be4e5870af 100644 --- a/src/com/android/settings/dream/WhenToDreamPreferenceController.java +++ b/src/com/android/settings/dream/WhenToDreamPreferenceController.java @@ -17,11 +17,13 @@ package com.android.settings.dream; import android.content.Context; -import androidx.preference.Preference; + import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.dream.DreamBackend; +import androidx.preference.Preference; + public class WhenToDreamPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java b/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java index 4f299401531bcf9953552d592ac7b0157ba4de0f..6de3a92333a162afe96274ed2bd777dabcfc16ee 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,15 +33,17 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; -import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.R; import com.android.settings.Settings; import com.android.settings.Utils; +import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import java.util.Objects; +import androidx.annotation.VisibleForTesting; + /** * Helper class for {@link ActionDisabledByAdminDialog} which sets up the dialog. */ diff --git a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java index 520c436662ecfd28dee151bc07227a23c030c0ce..954c643ac69e284318c0255854975c74301c5542 100644 --- a/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java @@ -15,7 +15,6 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import android.text.format.DateUtils; import com.android.settings.R; @@ -25,6 +24,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.Date; +import androidx.preference.Preference; + public abstract class AdminActionPreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java index 93ed1027c2550ad9ee9212650a03a90dd47fdc71..c438e663e0dafb5947eaaca2ec541ecb47c22668 100644 --- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java @@ -16,7 +16,6 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; @@ -24,6 +23,8 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public abstract class AdminGrantedPermissionsPreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java index 7b6d5df3fde4e9b1292ce6272ec39b175f55ee11..d523e3be09a6197f7f3bbf1e917c219fce0bd6ee 100644 --- a/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java @@ -14,13 +14,14 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class AlwaysOnVpnCurrentUserPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java index 07a39e3a90c07e04d9b246683673100bf29da4d2..a12b62cd1d9ad9a94af6fb393618265dc5faf6cf 100644 --- a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java +++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.enterprise; import android.content.Context; import android.content.pm.PackageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.IconDrawableFactory; import com.android.settings.SettingsPreferenceFragment; @@ -31,6 +29,9 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * PreferenceController that builds a dynamic list of applications provided by * {@link ApplicationListBuilder} instance. diff --git a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java index 6e81482e10001595aefc563d1dd83f402116a900..5a24ab8b5db946bbb14282d5abb9fc5a6b67e19f 100644 --- a/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java +++ b/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java @@ -15,11 +15,12 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.R; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase { @VisibleForTesting 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..411140c601233f57ebba9f377c988e6b5211fe27 100644 --- a/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java @@ -15,13 +15,14 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public abstract class CaCertsPreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java index 9e8574fcfb444a2a332bb4f62490476b582670b7..b3d5297364e81aee3255490f7f8b47a550fb65e6 100644 --- a/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java @@ -14,7 +14,6 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; @@ -22,6 +21,8 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class EnterpriseInstalledPackagesPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java index e0c287df9e7fdf7209a5d7b9bb56f70b269470cb..c5da685b1428a6543a6b97ec3b30f91e3674f9fc 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java @@ -14,13 +14,14 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java index 876d706d4af6aef5dbc52bb5af3fd388c5fde925..650871f541d9702cb4b975309e33d421bdcf9c54 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java @@ -21,10 +21,6 @@ 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; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -42,6 +38,11 @@ import java.util.Collections; import java.util.EnumMap; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * PreferenceController that builds a dynamic list of default apps set by device or profile owner. diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java index 63a552d0ac2ae53202a8efc98b1031221f7209d3..eed6ba1dc90f35bbbc322ba06a9051cc6c54d4fa 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java @@ -16,7 +16,6 @@ package com.android.settings.enterprise; import android.content.Context; import android.os.UserHandle; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.applications.ApplicationFeatureProvider; @@ -26,6 +25,8 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.users.UserFeatureProvider; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class EnterpriseSetDefaultAppsPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java index 2a2a94e704096f4fcec79198303603ff7bb4d91b..9c5906f3129392d0009e93b13f1ef46a9aaa44c1 100644 --- a/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java +++ b/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java @@ -15,13 +15,14 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public abstract class FailedPasswordWipePreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ImePreferenceController.java b/src/com/android/settings/enterprise/ImePreferenceController.java index fa4e7aa1a9a8e4f6ace67bd7cd38934495a2fe1a..3d2ed805d62a5e2ecb15aa5856145b9a6c70df83 100644 --- a/src/com/android/settings/enterprise/ImePreferenceController.java +++ b/src/com/android/settings/enterprise/ImePreferenceController.java @@ -15,13 +15,14 @@ package com.android.settings.enterprise; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class ImePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java index bbb217b498f65eb28a20a3340ccdfcf607a0eb2c..1b88e385830b65f8255fb760c000056e7ea52f10 100644 --- a/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java +++ b/src/com/android/settings/enterprise/ManageDeviceAdminPreferenceController.java @@ -19,7 +19,6 @@ import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; -import androidx.preference.Preference; public class ManageDeviceAdminPreferenceController extends BasePreferenceController { 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 03bba42f5be9fd3d83cc1efa88cd464b29e10204..e5729828cf19fd2893ea679d838a112e7230dfce 100644 --- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java @@ -20,7 +20,6 @@ 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; @@ -31,6 +30,8 @@ import com.android.settings.Utils; import com.android.settings.fingerprint.FingerprintEnrollSidecar.Listener; import com.android.settings.password.ChooseLockSettingsHelper; +import androidx.annotation.Nullable; + /** * Activity explaining the fingerprint sensor location for fingerprint enrollment. */ diff --git a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java index 226d7185fb40af8e17c2476b522269715ef4ebf2..b988ab7763e273b20d61605d3b3104d0f4e9dc5b 100644 --- a/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java +++ b/src/com/android/settings/fingerprint/FingerprintLocationAnimationVideoView.java @@ -24,7 +24,6 @@ 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; @@ -32,6 +31,8 @@ import android.view.View; import com.android.settings.R; +import androidx.annotation.VisibleForTesting; + /** * A view containing a VideoView for showing the user how to enroll a fingerprint */ 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 4aaf997dd857e5a4dd9c2401e66c4ea4193e954d..880ca629f2eb4acf4de7de8b22b7494cad067bc0 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; @@ -62,6 +56,13 @@ import com.android.settingslib.widget.FooterPreference; import java.util.HashMap; import java.util.List; +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; + /** * Settings screen for fingerprints */ diff --git a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java index 519f116a0483286672d7d4fcfeacfd6dc8477019..2839ee68a2f06e102644a5db90dab331bb118705 100644 --- a/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java +++ b/src/com/android/settings/fingerprint/FingerprintStatusPreferenceController.java @@ -22,7 +22,6 @@ 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; import com.android.settings.R; @@ -32,6 +31,8 @@ import com.android.settings.overlay.FeatureFactory; import java.util.List; +import androidx.preference.Preference; + public class FingerprintStatusPreferenceController extends BasePreferenceController { private static final String KEY_FINGERPRINT_SETTINGS = "fingerprint_settings"; diff --git a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java index 78dcb80afc0ae2830b4643dc0648917c15451cdb..3a4c3f73cc8f77ac6c009868bea8f8b78b993ff9 100644 --- a/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java +++ b/src/com/android/settings/fingerprint/SetupFingerprintEnrollFindSensor.java @@ -24,7 +24,6 @@ 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; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -33,6 +32,8 @@ import com.android.settings.SetupWizardUtils; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockSettingsHelper; +import androidx.annotation.NonNull; + public class SetupFingerprintEnrollFindSensor extends FingerprintEnrollFindSensor { @Override diff --git a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java index 6317ce760f4dd75f836e1844cb1240ee8d5cee60..a689fd2306674fde55b6ea72c835e1ae1efa18f5 100644 --- a/src/com/android/settings/flashlight/FlashlightSliceBuilder.java +++ b/src/com/android/settings/flashlight/FlashlightSliceBuilder.java @@ -34,18 +34,16 @@ import android.provider.Settings.Secure; import android.provider.SettingsSlicesContract; import android.util.Log; -import androidx.core.graphics.drawable.IconCompat; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.slices.SettingsSliceProvider; import com.android.settings.slices.SliceBroadcastReceiver; +import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; -import android.app.StatusBarManager; - /** * Utility class to build a Flashlight Slice, and handle all associated actions. diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index af1de4856f0f2898fe7f1023481936367bd3f88e..8fe50903023d15f8184adb2ea8d965613e27ae2c 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -27,8 +27,6 @@ import android.content.pm.PackageManager; import android.os.BatteryStats; import android.os.Bundle; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -62,6 +60,9 @@ import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Power usage detail fragment for each app, this fragment contains * diff --git a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java index 7527db3acb1ccb0b819f5ce511a69f56df10f71c..8ec877a23cd846d36c0b75afdd461e4e6470ece4 100644 --- a/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java +++ b/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceController.java @@ -17,12 +17,13 @@ package com.android.settings.fuelgauge; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Controller to change and update the auto restriction toggle */ diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java index cd384f1fa242432ed066d3c7cd2e595379133782..73d83e15db5bdc8ba42b16a7c9dd7e224a56cad1 100644 --- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java @@ -18,8 +18,6 @@ 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; import com.android.settings.R; import com.android.settings.Utils; @@ -33,6 +31,9 @@ import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller to control whether an app can run in the background */ diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 83b0984c7e9d6f71efc2b12fe1f2c5c104c3fd8c..f14b1c9ccdb9da197de1562b6a43886e63d3a389 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -27,14 +27,9 @@ 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; @@ -44,7 +39,6 @@ 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; @@ -58,6 +52,11 @@ import com.android.settingslib.utils.StringUtil; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Controller that update the battery header view */ diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java index bd64dd3d4c7425526191536d215c1eab27638f90..7a583d8b56eeaa9f86b5c6b2d626ef85c494b97a 100644 --- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java +++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java @@ -22,15 +22,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.PowerManager; -import androidx.annotation.IntDef; -import androidx.annotation.VisibleForTesting; - import com.android.settings.Utils; -import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; + /** * Use this broadcastReceiver to listen to the battery change, and it will invoke * {@link OnBatteryChangedListener} if any of the following has been changed: diff --git a/src/com/android/settings/fuelgauge/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 d1ce8b8c361a724fe3eae93d19ea6b8953715094..593cc770f6915a276d25ac173ade925be3cb0298 100644 --- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java @@ -23,9 +23,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; import android.os.PowerManager; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import android.widget.TextView; import com.android.settings.R; @@ -38,6 +35,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + /** * Controller that update the battery header view */ 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 35045c80247389feee532022d8e88433afa1f1ab..3c235f57f17ceec34e0fb662e0b8a5ce69367723 100644 --- a/src/com/android/settings/fuelgauge/BatteryMeterView.java +++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java @@ -22,7 +22,6 @@ 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; @@ -30,6 +29,8 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settingslib.graph.BatteryMeterDrawableBase; +import androidx.annotation.VisibleForTesting; + public class BatteryMeterView extends ImageView { @VisibleForTesting BatteryMeterDrawable mDrawable; diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java index 69511aca71f10b0ff6f7b2cdbabb1b69ba25784e..8baf2722acf41674692a63efbf7d06f9e9023df7 100644 --- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java @@ -15,8 +15,6 @@ package com.android.settings.fuelgauge; import android.os.Bundle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.Settings; @@ -28,6 +26,9 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.fuelgauge.PowerWhitelistBackend; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller that jumps to high power optimization fragment */ diff --git a/src/com/android/settings/fuelgauge/BatterySaverController.java b/src/com/android/settings/fuelgauge/BatterySaverController.java index 8b32a9cca1bf5b91e21d2172b11f1a918e4816fe..e2440a517a82eca2ab2b51986d8841fcc4c930ab 100644 --- a/src/com/android/settings/fuelgauge/BatterySaverController.java +++ b/src/com/android/settings/fuelgauge/BatterySaverController.java @@ -21,9 +21,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.PreferenceScreen; import com.android.settings.R; import com.android.settings.Utils; @@ -34,6 +31,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class BatterySaverController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, BatterySaverReceiver.BatterySaverListener { private static final String KEY_BATTERY_SAVER = "battery_saver_summary"; diff --git a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java index addd30945c5024d2dabd4d546c90d3ef411717a9..cb260afecef6fd9a43075a1f5bbdd17f9c0c3034 100644 --- a/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java +++ b/src/com/android/settings/fuelgauge/BatteryStatsHelperLoader.java @@ -17,14 +17,13 @@ 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; import com.android.settingslib.utils.AsyncLoader; +import androidx.annotation.VisibleForTesting; + /** * Loader to get new {@link BatteryStatsHelper} in the background */ 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..655a1b778da10ff2c7ab59b8dd710545b9e4b2ac 100644 --- a/src/com/android/settings/fuelgauge/InactiveApps.java +++ b/src/com/android/settings/fuelgauge/InactiveApps.java @@ -30,18 +30,17 @@ 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; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + public class InactiveApps extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java index 95ff45c922817bf20842d312fdc0770dac856f06..bfa0a7804621c40dca4f6556006788b0b0bebdb9 100644 --- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java +++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java @@ -19,7 +19,6 @@ 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; @@ -27,6 +26,8 @@ import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.widget.AppPreference; +import androidx.preference.PreferenceViewHolder; + /** * Custom preference for displaying battery usage info as a bar and an icon on * the left for the subsystem/app type. diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index 74098ffb9a06507ef66889e15a8f2bbb118c568b..8e3c8defaa58bb83a009c6c2557220575523ffea 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -21,7 +21,6 @@ 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; @@ -33,13 +32,13 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.search.SearchIndexable; -import com.android.settingslib.utils.StringUtil; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class PowerUsageAdvanced extends PowerUsageBase { private static final String TAG = "AdvancedBatteryUsage"; diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java index 5b4e22dd3edf27adea1ed903120934e34f1d7b8a..c056814476001e7869c1ece3dad914ba5fa5d478 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java @@ -21,8 +21,6 @@ import android.content.pm.PackageManager; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; @@ -40,6 +38,9 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + /** * Fragment to show a list of anomaly apps, where user could handle these anomalies */ diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java index aa029191a86ad012b146562335d73301ad450483..41bf06eaf3736a3851e0e6a796f2b4efc9057f01 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,12 +23,13 @@ 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 com.android.internal.os.BatteryStatsHelper; import com.android.settings.dashboard.DashboardFragment; +import androidx.annotation.VisibleForTesting; + /** * Common base class for things that need to show the battery usage graph. */ diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index 82cd16a796b0ee13fec0f365de4cf655a5eab19a..828b34bb973cd4209859a6e74f6d65937ebe48fc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -35,7 +35,6 @@ import android.view.MenuItem; 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; @@ -62,6 +61,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Displays a list of apps and subsystems that consume power, ordered by how much power was * consumed since the last time it was unplugged. diff --git a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java index f282154b66934ae9900f67fc56080af892236dd7..64489eaf7e2d49f20f2787537131c66b85ab2a24 100644 --- a/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java +++ b/src/com/android/settings/fuelgauge/RestrictAppPreferenceController.java @@ -19,13 +19,9 @@ 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; @@ -33,6 +29,9 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipUtils; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller to change and update the smart battery toggle */ diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index d74f9b1ba5d6d10d3a15aaf9a5fcac32826aeb40..5d92bfd61af0b5f9f67785e338eb6a4708f8bf9c 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -21,9 +21,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -import androidx.preference.CheckBoxPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; import android.util.IconDrawableFactory; import com.android.internal.annotations.VisibleForTesting; @@ -45,6 +42,10 @@ import com.android.settingslib.widget.FooterPreferenceMixin; import java.util.List; +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + /** * Fragment to show a list of anomaly apps, where user could handle these anomalies */ diff --git a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java index d4dc4d2ed40d4108c6ca82ddcd93f26ff6d38ca1..0e8281de754cce79ad2a19a6d2264ba36d347805 100644 --- a/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/SmartBatteryPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.provider.Settings; import android.text.TextUtils; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; - import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Controller to change and update the smart battery toggle */ diff --git a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java index edbc14f5fb603e38a7c78a7d63518f7e08c7ce11..5ff21cb18318d0a775c27267fa921a7496aa0caf 100644 --- a/src/com/android/settings/fuelgauge/anomaly/Anomaly.java +++ b/src/com/android/settings/fuelgauge/anomaly/Anomaly.java @@ -18,13 +18,14 @@ package com.android.settings.fuelgauge.anomaly; import android.os.Parcel; import android.os.Parcelable; -import androidx.annotation.IntDef; import android.text.TextUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.Objects; +import androidx.annotation.IntDef; + /** * Data that represents an app has been detected as anomaly. It contains * diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java index 55d972157b24d67710be89a6944cd245c7b6babf..712fe93fafadbac769e4b9e1c7c89a96981edd5f 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDetectionPolicy.java @@ -19,7 +19,6 @@ 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; @@ -28,6 +27,8 @@ import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; +import androidx.annotation.VisibleForTesting; + /** * Class to store the policy for anomaly detection, which comes from * {@link android.provider.Settings.Global} diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java index 918f98af50e06bfee6566271bd73f30b1b371196..d1d14b552454597efa1fba849a14eabaa0d25faf 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyDialogFragment.java @@ -21,13 +21,14 @@ 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; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.fuelgauge.anomaly.action.AnomalyAction; +import androidx.annotation.VisibleForTesting; + /** * Dialog Fragment to show action dialog for each anomaly */ diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java index fbd7dedf05a8104bf9fe20cf3d55fdbe2fe2d3a4..8917e35f6bc56f33f4c44505d09eded1350b5efb 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyLoader.java @@ -21,18 +21,16 @@ 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 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; +import androidx.annotation.VisibleForTesting; + /** * Loader to compute which apps are anomaly and return a anomaly list. It will return * an empty list if there is no anomaly. 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..70c83bcc7d7a4cdffaeff23672b71ce159510404 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceController.java @@ -17,8 +17,6 @@ package com.android.settings.fuelgauge.anomaly; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -28,6 +26,9 @@ import com.android.settings.fuelgauge.PowerUsageAnomalyDetails; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Manager that responsible for updating high usage preference and handling preference click. */ diff --git a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java index 2926547237d163fe382ec1a016809047551d4775..dc4bee0ae8264ca7bbfdd6b3c1f3ac34fefd8df3 100644 --- a/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java +++ b/src/com/android/settings/fuelgauge/anomaly/AnomalyUtils.java @@ -18,7 +18,6 @@ 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; @@ -37,6 +36,8 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Utility class for anomaly detection */ diff --git a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java index e3666d8f14c7312200299bb8d1604e8062de549f..ed2387c1862ab25f28a416e0ec1fda61499f24ac 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/BackgroundCheckAction.java @@ -19,12 +19,13 @@ 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; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.anomaly.Anomaly; +import androidx.annotation.VisibleForTesting; + /** * Background check action for anomaly app, which means to stop app running in the background */ diff --git a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java index dcf7e46fda55de25f53c96444abd0c8a9bdeb2a9..cdeab5dc10f29673b0562752cc2812d372694fe9 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/LocationCheckAction.java @@ -19,12 +19,13 @@ 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; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.anomaly.Anomaly; +import androidx.annotation.VisibleForTesting; +import androidx.core.content.PermissionChecker; + /** * Location action for anomaly app, which means to turn off location permission for this app */ diff --git a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java index b5fd20b5caa16c99991663f03e5ceaba39efc88c..a89e1288d31fa96df018388ec43de7b6151d0712 100644 --- a/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java +++ b/src/com/android/settings/fuelgauge/anomaly/action/StopAndBackgroundCheckAction.java @@ -17,11 +17,12 @@ package com.android.settings.fuelgauge.anomaly.action; import android.content.Context; -import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.fuelgauge.anomaly.Anomaly; +import androidx.annotation.VisibleForTesting; + /** * Force stop and background check action for anomaly app, this action will * 1. Force stop the app diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java index 5cb188a220a5e93a108982cf65ee2410a70bde2e..0641a85cf708448614f489eefd2502bed4a2ede0 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/BluetoothScanAnomalyDetector.java @@ -19,9 +19,6 @@ 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,11 +27,12 @@ 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; +import androidx.annotation.VisibleForTesting; + /** * Check whether apps have unoptimized bluetooth scanning in the background */ diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java index 73d092517a1ffe0bdd8db0d335cf212efc860616..ffed1e8b6ea9a1f7a2c86cb85aac999f499a9d12 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeLockAnomalyDetector.java @@ -20,7 +20,6 @@ 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; import com.android.internal.os.BatteryStatsHelper; @@ -33,6 +32,8 @@ import com.android.settings.fuelgauge.anomaly.AnomalyUtils; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Check whether apps holding wakelock too long */ diff --git a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java index f891b514868d0a6a21b09369c1ab6c0d4fc20513..f6c3aff205e29165608c43d12aa815333aef8b93 100644 --- a/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java +++ b/src/com/android/settings/fuelgauge/anomaly/checker/WakeupAlarmAnomalyDetector.java @@ -18,11 +18,8 @@ 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 com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -33,11 +30,12 @@ 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; +import androidx.annotation.VisibleForTesting; + /** * Check whether apps has too many wakeup alarms */ diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java index 06c05c075d5f616e455847e65f98cb134d5259d6..ad916ee4bd395f396741c77e6cb30f0becd38ff2 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceController.java @@ -17,12 +17,13 @@ package com.android.settings.fuelgauge.batterysaver; import android.content.Context; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.fuelgauge.BatterySaverUtils; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Controller that update whether to turn on battery saver automatically */ diff --git a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java index 379b995aa4b46918f46bbfc611fcbaf5b3067852..63bd6977364d0cb5cf9a11a7af39fd9e8e717695 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceController.java @@ -22,9 +22,6 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.view.accessibility.AccessibilityNodeInfo; @@ -37,6 +34,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Controller that update the battery saver seekbar */ diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java index 331572ba6114dcfb194a12a4dffdcda03889a24a..60d1c9561acf2e5ba2aec515606473e9d4ea5094 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobService.java @@ -22,7 +22,6 @@ 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 com.android.settings.R; @@ -30,6 +29,8 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.TimeUnit; +import androidx.annotation.VisibleForTesting; + /** A JobService to clean up obsolete data in anomaly database */ public class AnomalyCleanupJobService extends JobService { private static final String TAG = "AnomalyCleanUpJobService"; diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java index 44169f0bfe62ef25b33cf8b51f0a57587e612dd6..0a19addb07c5d069f7bfce4d054b100acee10dc3 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobService.java @@ -25,7 +25,6 @@ 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; @@ -35,6 +34,8 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.concurrent.TimeUnit; +import androidx.annotation.VisibleForTesting; + /** A JobService check whether to update the anomaly config periodically */ public class AnomalyConfigJobService extends JobService { private static final String TAG = "AnomalyConfigJobService"; diff --git a/src/com/android/settings/fuelgauge/batterytip/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..d5f87945c56e21094488cfdde6ccc68671b774fb 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDatabaseHelper.java @@ -19,7 +19,6 @@ 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 com.android.settings.fuelgauge.anomaly.Anomaly; @@ -27,6 +26,8 @@ import com.android.settings.fuelgauge.anomaly.Anomaly; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import androidx.annotation.IntDef; + /** * Database controls the anomaly logging(e.g. packageName, anomalyType and time) */ diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java index 2dc35f17a74d1f1caec882269a17cb4fd592a464..70cdf9289507d44ba6acf98f3dec68e7d97fd9b0 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java +++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java @@ -34,10 +34,6 @@ import android.os.Bundle; import android.os.StatsDimensionsValue; import android.os.UserManager; import android.provider.Settings; - -import androidx.annotation.VisibleForTesting; -import androidx.annotation.GuardedBy; - import android.util.Log; import android.util.Pair; @@ -55,6 +51,9 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; +import androidx.annotation.GuardedBy; +import androidx.annotation.VisibleForTesting; + /** A JobService to store anomaly data to anomaly database */ public class AnomalyDetectionJobService extends JobService { private static final String TAG = "AnomalyDetectionService"; diff --git a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java index 4128f9dc487d2effa31ab3917d4d4fd76e7c02e8..34aefd6126badf41b47cc0f338066271c2ddb3da 100644 --- a/src/com/android/settings/fuelgauge/batterytip/AppInfo.java +++ b/src/com/android/settings/fuelgauge/batterytip/AppInfo.java @@ -18,7 +18,6 @@ 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; @@ -26,6 +25,8 @@ import com.android.settings.fuelgauge.anomaly.Anomaly; import java.util.Objects; +import androidx.annotation.VisibleForTesting; + /** * Model class stores app info(e.g. package name, type..) that used in battery tip */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java index 772660a69d33d5bbd9ae00ea28e16717eb9659cb..2411db4ad5be4e8d39222cd81face2b9fb4c7f29 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryDatabaseManager.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import static android.database.sqlite.SQLiteDatabase.CONFLICT_IGNORE; - import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns .ANOMALY_STATE; import static com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper.AnomalyColumns diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index 5cd52775ec06f151307b74b134c81c485cfbb6cf..4b086262a6c5cacb7d7ab3580c8bf7c6478d7606 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -21,9 +21,6 @@ import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -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; @@ -32,18 +29,19 @@ 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; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Dialog Fragment to show action dialog for each anomaly */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java index c445687b20f3f8e497515d8f7e5505bad05aab28..b46c12eb551d3a732246cfde3117f37ba3a2a6a8 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import android.content.Context; -import androidx.annotation.VisibleForTesting; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.fuelgauge.BatteryInfo; @@ -26,8 +25,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; @@ -38,6 +37,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Loader to compute and return a battery tip list. It will always return a full length list even * though some tips may have state {@code BaseBatteryTip.StateType.INVISIBLE}. diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java index 42e723d23966cceb43375380a6634f39b4c6b6f1..22c90e3884572b9dfe3e14041ecb396abaa55c0f 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 java.time.Duration; -import java.util.concurrent.TimeUnit; + +import androidx.annotation.VisibleForTesting; /** * 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..263279575a2173d94494481239e2f0245f74a188 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java @@ -18,12 +18,7 @@ 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,11 +29,15 @@ 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; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + /** * Controller in charge of the battery tip group */ diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java index da2d81f1ff412770861bac74748d57859508f8c4..df6fa5a5c11eab47fd2c1e927d5afef834ea188e 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java @@ -23,7 +23,6 @@ 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; import com.android.settings.SettingsActivity; @@ -42,6 +41,8 @@ import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; + /** * Utility class for {@link BatteryTip} */ diff --git a/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java b/src/com/android/settings/fuelgauge/batterytip/HighUsageAdapter.java index b1866b9d2228050128fe15f2086cf283f1d8031d..831226c6ca589035f4b986ea8d1593689d8f1f95 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; @@ -29,10 +28,12 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.Utils; - import com.android.settingslib.utils.StringUtil; + import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + /** * Adapter for the high usage app list */ diff --git a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java index 7d81c4273d808422ac5384b9984779ab20d3170e..c246f0a58312e01fe7a7dc01e0fc6de26577be45 100644 --- a/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java +++ b/src/com/android/settings/fuelgauge/batterytip/StatsManagerConfig.java @@ -16,14 +16,11 @@ 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; +import androidx.annotation.IntDef; + /** * This class provides all the configs needed if we want to use {@link android.app.StatsManager} */ diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/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/OpenRestrictAppFragmentAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java index 9d35615840a4deec3906c541e51e583951594392..98d6dcc96de19d22e6447a34bba01440743ac9bc 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/OpenRestrictAppFragmentAction.java @@ -16,8 +16,6 @@ package com.android.settings.fuelgauge.batterytip.actions; -import androidx.annotation.VisibleForTesting; - import com.android.internal.logging.nano.MetricsProto; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.RestrictedAppDetails; @@ -29,6 +27,8 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Action to open the {@link com.android.settings.fuelgauge.RestrictedAppDetails} */ diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java index 59b5c15b0556589147705d55fc96e617b257c0cc..390515672ac1078a6f2eed8cf6ec787a5d7b9a1b 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/RestrictAppAction.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; @@ -31,6 +30,8 @@ import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Action to restrict the apps, then app is not allowed to run in the background. */ diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java index ea40107d62edd08bd10a9e99417ce3be1e41e0a6..8a371efd38a96a00b0bb6fdea32e7905e44dfd46 100644 --- a/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java +++ b/src/com/android/settings/fuelgauge/batterytip/actions/UnrestrictAppAction.java @@ -18,7 +18,6 @@ package com.android.settings.fuelgauge.batterytip.actions; import android.app.AppOpsManager; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.Pair; import com.android.internal.logging.nano.MetricsProto; @@ -26,6 +25,8 @@ import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.batterytip.AppInfo; import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip; +import androidx.annotation.VisibleForTesting; + /** * Action to clear the restriction to the app */ diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java index 664a8ca202e9786a29d2db69433b7414189d8012..c67b2a834eb41afa10b962792da64aa6183666f9 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/HighUsageDetector.java @@ -18,15 +18,14 @@ 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 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; @@ -36,6 +35,8 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; +import androidx.annotation.VisibleForTesting; + /** * Detector whether to show summary tip. This detector should be executed as the last * {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips} diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java index 3ff0989d08af049d99f10e0f7fe11626408de1df..312eeb825a403d5e60cfe5e21f6ba111b8eca3f2 100644 --- a/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java +++ b/src/com/android/settings/fuelgauge/batterytip/detectors/RestrictAppDetector.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip.detectors; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.text.format.DateUtils; import com.android.settings.fuelgauge.batterytip.AnomalyDatabaseHelper; @@ -32,6 +31,8 @@ import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Detector whether to show summary tip. This detector should be executed as the last * {@link BatteryTipDetector} since it need the most up-to-date {@code visibleTips} diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/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..496320f0d01ebbcd1932310a124f623f9ddefb99 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java @@ -19,10 +19,6 @@ package com.android.settings.fuelgauge.batterytip.tips; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -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; @@ -30,6 +26,11 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import androidx.annotation.IdRes; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Base model for a battery tip(e.g. suggest user to turn on battery saver) * diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java index 2b8ad231c10e9d4bf40c18433e97e66559a6f5bb..b308e1bb81f2187b0b16eb28cad35f56b126a3a7 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java @@ -19,16 +19,16 @@ 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; +import androidx.annotation.VisibleForTesting; + /** * Tip to show general summary about battery life */ diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java index 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..e7f523064e81a16c596e594faa6891c1b09e1e3c 100644 --- a/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java +++ b/src/com/android/settings/fuelgauge/batterytip/tips/SummaryTip.java @@ -19,12 +19,13 @@ 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.settingslib.core.instrumentation.MetricsFeatureProvider; +import androidx.annotation.VisibleForTesting; + /** * Tip to show general summary about battery life */ 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..08b7ff1948c191c88eeef07b292ba32bb0647aa8 100644 --- a/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java +++ b/src/com/android/settings/gestures/AssistGestureSettingsPreferenceController.java @@ -22,8 +22,6 @@ 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; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; @@ -32,6 +30,9 @@ import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class AssistGestureSettingsPreferenceController extends GesturePreferenceController { private static final String PREF_KEY_VIDEO = "gesture_assist_video"; diff --git a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java index 4433dd6e29e9084a60d73f21d4e1bec9a6601377..321482d83028ed43e5b34833942eb45b39f0b6c9 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java @@ -22,7 +22,6 @@ 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 com.android.settings.R; @@ -30,6 +29,8 @@ import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; +import androidx.annotation.VisibleForTesting; + public class DoubleTapPowerPreferenceController extends GesturePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java index c99fd3f66e11b52f97d1ff19801e3a0ac53c3d53..c870d3b97e940d987f6fabbb872f0ed6d4d41171 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java @@ -16,6 +16,8 @@ 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; @@ -24,16 +26,13 @@ import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; -import androidx.preference.Preference; -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; +import androidx.annotation.VisibleForTesting; public class DoubleTapScreenPreferenceController extends GesturePreferenceController { diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index fcea8e406273ad971efc304a72029d730abe10e4..496a45d74e8e1d3108873a884e6069507ce6dde6 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; @@ -30,7 +29,6 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settingslib.search.SearchIndexable; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java index 6a72dc4e4d7c6a7d9a4612e2cef3f927813881b1..fe8aa5701bf50c6053475bbd5d1d7db02f5631e2 100644 --- a/src/com/android/settings/gestures/DoubleTwistPreferenceController.java +++ b/src/com/android/settings/gestures/DoubleTwistPreferenceController.java @@ -24,12 +24,13 @@ 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 com.android.settings.R; import com.android.settings.Utils; +import androidx.annotation.VisibleForTesting; + public class DoubleTwistPreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/GesturePreferenceController.java b/src/com/android/settings/gestures/GesturePreferenceController.java index 780325f085733210554f815875e91ecf86c3c403..7b649e17038744d411582ea340452ac28cc665a8 100644 --- a/src/com/android/settings/gestures/GesturePreferenceController.java +++ b/src/com/android/settings/gestures/GesturePreferenceController.java @@ -18,10 +18,6 @@ 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; @@ -32,6 +28,10 @@ import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class GesturePreferenceController extends TogglePreferenceController implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/gestures/PickupGesturePreferenceController.java b/src/com/android/settings/gestures/PickupGesturePreferenceController.java index 6d01e52e84292c04bf48d66101e7a55d0ff1c8b7..41305195af2efc1461ac030473e41df760cd258b 100644 --- a/src/com/android/settings/gestures/PickupGesturePreferenceController.java +++ b/src/com/android/settings/gestures/PickupGesturePreferenceController.java @@ -24,7 +24,6 @@ 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 com.android.internal.hardware.AmbientDisplayConfiguration; @@ -33,6 +32,8 @@ import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; +import androidx.annotation.VisibleForTesting; + public class PickupGesturePreferenceController extends GesturePreferenceController { private final int ON = 1; diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index b8d157c010708173c1fbbd349785439d17039d2f..84b4e164169da5eb709abe277df39b5974997d34 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -17,18 +17,14 @@ 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 com.android.settingslib.search.SearchIndexable; -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 7f685e59b562a57307539c31ff6951cba70bfcd9..1e7c1481403e3ea07bb48a5fd2f5b315f63f6b23 100644 --- a/src/com/android/settings/gestures/PreventRingingPreferenceController.java +++ b/src/com/android/settings/gestures/PreventRingingPreferenceController.java @@ -16,7 +16,6 @@ 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; @@ -25,7 +24,6 @@ import android.content.Context; import android.os.Bundle; import android.provider.Settings; -import com.android.settings.R; import com.android.settings.widget.VideoPreference; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnCreate; diff --git a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java index 980494a4ec89f8c8b554b79dbd4d7c364f41781d..87333a0ac705f90dd12c05bad71c8cd7c46e8249 100644 --- a/src/com/android/settings/inputmethod/GameControllerPreferenceController.java +++ b/src/com/android/settings/inputmethod/GameControllerPreferenceController.java @@ -19,11 +19,6 @@ package com.android.settings.inputmethod; import android.content.Context; import android.hardware.input.InputManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import android.text.TextUtils; import android.view.InputDevice; import com.android.settings.R; @@ -33,6 +28,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class GameControllerPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/inputmethod/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/KeyboardLayoutPickerController.java b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java index 3e81ff74417cd86b40d577ec22daeab7958474fe..3ea1016703fa60095666d2dd670b0a0b1b6f553b 100644 --- a/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java +++ b/src/com/android/settings/inputmethod/KeyboardLayoutPickerController.java @@ -22,9 +22,6 @@ import android.content.Context; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.view.InputDevice; import com.android.settings.core.BasePreferenceController; @@ -36,6 +33,10 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class KeyboardLayoutPickerController extends BasePreferenceController implements InputManager.InputDeviceListener, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java index d7a4f77f77469508c7f3cf1e4e7b2d98a8e5bc3e..734c290576a4b0d6c4ba9e430f5daf3dc3a5a2d5 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java @@ -30,11 +30,6 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.SearchIndexableResource; import android.provider.Settings.Secure; -import androidx.preference.SwitchPreference; -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; @@ -54,6 +49,12 @@ import java.util.Arrays; import java.util.List; import java.util.Objects; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @SearchIndexable public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment implements InputManager.InputDeviceListener, diff --git a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java index 367ea80e07db7f175d0f3a7f6fc3a30bfc41156b..c0f5782ff220bc18e47e0081a907e34c899c9d36 100644 --- a/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java @@ -20,8 +20,6 @@ import android.content.Context; import android.hardware.input.InputManager; import android.icu.text.ListFormatter; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo; @@ -34,6 +32,8 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause, diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java index 62874266bf38bd3180a39515c13d32955a044ca2..83d24d942999ec755cd9832386e1d4e1398d98f0 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java @@ -21,7 +21,6 @@ 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; @@ -30,6 +29,8 @@ import android.view.textservice.SpellCheckerInfo; import com.android.settings.CustomListPreference; import com.android.settings.R; +import androidx.preference.PreferenceViewHolder; + /** * Spell checker service preference. * diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java index 8adf2389770d37c5e8a7e82de9f8a13aa2bc2090..10d84141c18d8f971d24eb16c6eff3c9c6db2158 100644 --- a/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java +++ b/src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java @@ -17,8 +17,6 @@ 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; @@ -27,6 +25,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class SpellCheckerPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java index 3f38704de6ed3c461f02bc46491d65498ddfb629..1a828ce506d07467858efa41c1b44c0f147fcb6c 100644 --- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java +++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java @@ -22,10 +22,6 @@ 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; @@ -39,6 +35,11 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.widget.SwitchBar; import com.android.settings.widget.SwitchBar.OnSwitchChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + public class SpellCheckersSettings extends SettingsPreferenceFragment implements OnSwitchChangeListener, OnPreferenceClickListener, OnPreferenceChangeListener { private static final String TAG = SpellCheckersSettings.class.getSimpleName(); diff --git a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java index 3f1122a58ce6a0549065dcb562604395f9473e67..73602dc80a3c8b3026590bf9a3f07eb8b93a8d04 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java +++ b/src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java @@ -21,13 +21,14 @@ 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 java.util.Locale; import java.util.Objects; import java.util.Set; +import androidx.annotation.VisibleForTesting; + public class UserDictionaryCursorLoader extends CursorLoader { @VisibleForTesting diff --git a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java index 83fd89d08fee3fd2c93e6d1c8fd9eb226ea45db5..d2336606e162aacc28dda071491db30aab03efe1 100644 --- a/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java +++ b/src/com/android/settings/inputmethod/UserDictionaryListPreferenceController.java @@ -20,10 +20,6 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.provider.UserDictionary; -import androidx.annotation.NonNull; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; @@ -39,6 +35,11 @@ import java.util.List; import java.util.Locale; import java.util.TreeSet; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class UserDictionaryListPreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java index 6d234042c6f32865963171b5effae8ac1c3f0780..939309d505c60d2f8423ec7719d0f8f84478fbee 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardFragment.java @@ -24,7 +24,6 @@ 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; @@ -43,6 +42,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; + @SearchIndexable public final class VirtualKeyboardFragment extends SettingsPreferenceFragment implements Indexable { diff --git a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java index 61e6a424641115870ded57ef88b69f43df0c08cf..5c6844931fd6ac4743513b760375fcd26e305f92 100644 --- a/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java +++ b/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java @@ -24,8 +24,6 @@ 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; @@ -33,6 +31,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + public class VirtualKeyboardPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index efa0396c4d9168912c311afb32ea04fafdf3fac5..01b7a6cfb9a3478c7372f8b737f3049e219490e4 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -24,8 +24,6 @@ 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; @@ -48,6 +46,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + @SearchIndexable public class LanguageAndInputSettings extends DashboardFragment { diff --git a/src/com/android/settings/language/PhoneLanguagePreferenceController.java b/src/com/android/settings/language/PhoneLanguagePreferenceController.java index f3f78d23296ac3a6a15914d1e5398968e817537a..0f9b4197adadfcd308931a4f0ec8d071937abc12 100644 --- a/src/com/android/settings/language/PhoneLanguagePreferenceController.java +++ b/src/com/android/settings/language/PhoneLanguagePreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.language; import android.content.Context; -import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -29,6 +28,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.preference.Preference; + public class PhoneLanguagePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/language/PointerSpeedController.java b/src/com/android/settings/language/PointerSpeedController.java index 8a0226a20d1b4349d5167bce8f5530e9138c7992..3da3c49b68d87959d42a70cb47eff503ef1f7518 100644 --- a/src/com/android/settings/language/PointerSpeedController.java +++ b/src/com/android/settings/language/PointerSpeedController.java @@ -18,8 +18,8 @@ package com.android.settings.language; import android.content.Context; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import androidx.annotation.VisibleForTesting; 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 ca827fd2ad4dd49622f824b3d6fb77a515027a87..0238dc2f042261a4745035954f1beb5591bafa14 100644 --- a/src/com/android/settings/language/UserDictionaryPreferenceController.java +++ b/src/com/android/settings/language/UserDictionaryPreferenceController.java @@ -19,7 +19,6 @@ 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; import com.android.settings.inputmethod.UserDictionaryList; @@ -29,6 +28,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.TreeSet; +import androidx.preference.Preference; + public class UserDictionaryPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java b/src/com/android/settings/localepicker/LocaleDragAndDropAdapter.java index 01f46ee5e3ae750322b480bd9fdb893fea58108d..4fdbec2b80a23ac5d99c3f5a35e9e28fe0378cde 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; @@ -34,15 +31,18 @@ import android.widget.CompoundButton; 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; import java.util.List; import java.util.Locale; +import androidx.core.view.MotionEventCompat; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; + class LocaleDragAndDropAdapter extends RecyclerView.Adapter { diff --git a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java index d3d58ff73e535bb0e007aef23dc3e041438b1241..d059ad9774a8d35d094330294d6e30c7563268d6 100644 --- a/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java +++ b/src/com/android/settings/localepicker/LocaleLinearLayoutManager.java @@ -18,13 +18,14 @@ package com.android.settings.localepicker; import android.content.Context; import android.os.Bundle; -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; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + /** * Add accessibility actions to the drag-and-drop locale list * diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java index de68f00e318e31693c0fa6708bf604da7aac0610..d20d5cd8dfd89fc059407f93c826b8558d176956 100644 --- a/src/com/android/settings/localepicker/LocaleListEditor.java +++ b/src/com/android/settings/localepicker/LocaleListEditor.java @@ -16,20 +16,21 @@ 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 com.android.internal.app.LocalePicker; import com.android.internal.app.LocalePickerWithRegion; import com.android.internal.app.LocaleStore; @@ -41,7 +42,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import static android.os.UserManager.DISALLOW_CONFIG_LOCALE; +import androidx.recyclerview.widget.RecyclerView; /** * 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..a810dbf4bcc3169259e7a3e2e7b32265241ebb3a 100644 --- a/src/com/android/settings/location/BluetoothScanningPreferenceController.java +++ b/src/com/android/settings/location/BluetoothScanningPreferenceController.java @@ -15,12 +15,13 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class BluetoothScanningPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java index d45128cea3d3ff22fe2eeba935dd5e9cb40d38fb..78dd206ca3ed72ff6dcd0bbab8c0bcccf61d13c1 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,7 +26,6 @@ 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 com.android.settings.Utils; @@ -33,9 +35,7 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import static com.android.settingslib.Utils.updateLocationMode; -import static com.android.settingslib.Utils.updateLocationEnabled; -import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced; +import androidx.annotation.VisibleForTesting; /** diff --git a/src/com/android/settings/location/LocationFooterPreferenceController.java b/src/com/android/settings/location/LocationFooterPreferenceController.java index 658c3cd45206814f3ed8ab750864f5185afb6fdf..6a2c89a784614f434eab9a4283375c36a690cfe5 100644 --- a/src/com/android/settings/location/LocationFooterPreferenceController.java +++ b/src/com/android/settings/location/LocationFooterPreferenceController.java @@ -22,19 +22,22 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.location.LocationManager; -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; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + /** * Preference controller for location footer preference category */ diff --git a/src/com/android/settings/location/LocationForWorkPreferenceController.java b/src/com/android/settings/location/LocationForWorkPreferenceController.java index 3f51d6f4db5cdbdef616abfb087ad712c07fa0a4..84607a8ebb68202302a547780a3ebb0850d40b9c 100644 --- a/src/com/android/settings/location/LocationForWorkPreferenceController.java +++ b/src/com/android/settings/location/LocationForWorkPreferenceController.java @@ -17,8 +17,6 @@ package com.android.settings.location; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.Utils; @@ -26,6 +24,9 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class LocationForWorkPreferenceController extends LocationBasePreferenceController { /** diff --git a/src/com/android/settings/location/LocationPreferenceController.java b/src/com/android/settings/location/LocationPreferenceController.java index a091ca82b0150b9d53b5e94f94c5c352fb330d3d..1711b51ec4e02c94b68b772942e428e4ea51a15e 100644 --- a/src/com/android/settings/location/LocationPreferenceController.java +++ b/src/com/android/settings/location/LocationPreferenceController.java @@ -21,20 +21,22 @@ 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; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class LocationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 33fe612913a23e318dde7004f478be97e188781a..563a6534d31057fdf58b35b4088b61415993673a 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -18,8 +18,8 @@ package com.android.settings.location; import android.content.Context; -import com.android.settings.core.BasePreferenceController; import com.android.settings.R; +import com.android.settings.core.BasePreferenceController; import androidx.annotation.VisibleForTesting; diff --git a/src/com/android/settings/location/LocationServicePreferenceController.java b/src/com/android/settings/location/LocationServicePreferenceController.java index 9860abd85d224ff88b1d0e38cbcd15b5d21c7581..67ec1526a0da2c869275dfa8a2e59512ffdab22e 100644 --- a/src/com/android/settings/location/LocationServicePreferenceController.java +++ b/src/com/android/settings/location/LocationServicePreferenceController.java @@ -19,10 +19,6 @@ import android.content.Intent; import android.content.IntentFilter; import android.location.SettingInjectorService; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.util.Log; import com.android.settings.Utils; @@ -34,6 +30,11 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + public class LocationServicePreferenceController extends LocationBasePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/location/LocationSliceBuilder.java b/src/com/android/settings/location/LocationSliceBuilder.java index 63c4be887748c84a192d978335db92f180a53bd7..f5333634da361671b76cb7e74e045788acba830f 100644 --- a/src/com/android/settings/location/LocationSliceBuilder.java +++ b/src/com/android/settings/location/LocationSliceBuilder.java @@ -18,7 +18,6 @@ package com.android.settings.location; import static android.provider.SettingsSlicesContract.KEY_LOCATION; - import static androidx.slice.builders.ListBuilder.ICON_IMAGE; import android.annotation.ColorInt; 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 6953e2617aa23e37d619ca3afe94463980478226..77f1b10b947f0d8efb41e9a7760aaf76722beed9 100644 --- a/src/com/android/settings/location/RecentLocationRequestPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestPreferenceController.java @@ -16,10 +16,7 @@ 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,8 +24,14 @@ 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; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + public class RecentLocationRequestPreferenceController extends LocationBasePreferenceController { /** Key for preference category "Recent location requests" */ diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java b/src/com/android/settings/location/RecentLocationRequestSeeAllFragment.java index 7bc777882874b75ae136f47d952310bb9569af0f..8a15734c3ab7d997a8af7495cdc3a38d148256cc 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; diff --git a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java index 99dc9fc348715d87e5933f93d6b51fc5859bfecc..644025e741d22ed9049ca71b759ab3e4b92a0c3e 100644 --- a/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java +++ b/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceController.java @@ -17,15 +17,18 @@ package com.android.settings.location; import android.content.Context; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; + import com.android.settings.widget.AppPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.location.RecentLocationApps; + import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** Preference controller for preference category displaying all recent location requests. */ public class RecentLocationRequestSeeAllPreferenceController extends LocationBasePreferenceController { diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index 52b06564f759e04f07fd0a112dda1c06a2df54bb..1206e85c9d509aa90d27f862c012c3ed586c5680 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -37,7 +37,6 @@ 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; @@ -57,6 +56,8 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import androidx.preference.Preference; + /** * Adds the preferences specified by the {@link InjectedSetting} objects to a preference group. * diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index c5389ca496cc5cbc9638c181c9208ed4df83440b..255ed31aabb421000648558ca9a6170733eb01a8 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -15,12 +15,13 @@ package com.android.settings.location; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class WifiScanningPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java index de542ace95cb56e657e0ac64d4b88b1b316067ef..657f5b06d34b241d58c8d2c06a2475aa561e2ab4 100644 --- a/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java +++ b/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelper.java @@ -26,15 +26,10 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.Uri; import android.os.PersistableBundle; -import androidx.core.graphics.drawable.IconCompat; import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.util.Log; -import androidx.slice.Slice; -import androidx.slice.builders.ListBuilder; -import androidx.slice.builders.SliceAction; - import com.android.ims.ImsManager; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; @@ -51,6 +46,11 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.SliceAction; + /** * Helper class to control slices for enhanced 4g LTE settings. */ diff --git a/src/com/android/settings/network/AirplaneModePreferenceController.java b/src/com/android/settings/network/AirplaneModePreferenceController.java index 0eddd9e91536d19384f00d60ac56831094728440..8272b73f368657012f7584e1c8448838bf0d3652 100644 --- a/src/com/android/settings/network/AirplaneModePreferenceController.java +++ b/src/com/android/settings/network/AirplaneModePreferenceController.java @@ -35,9 +35,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; public class AirplaneModePreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause, diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java index 5b59feacb3a529a7b194fe83a277a2dd962a1da1..111e0ba5d33064e46200d660e9f1edfb6d709035 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; @@ -61,6 +54,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +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; + public class ApnEditor extends SettingsPreferenceFragment implements OnPreferenceChangeListener, OnKeyListener { diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java index ee53ca9518f079b6def97bc4519c6112ec4f9c7b..603200f51ab13d66461717d8e8b96c8bfc03174d 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; @@ -34,6 +32,9 @@ import android.widget.RelativeLayout; import com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener, OnClickListener { final static String TAG = "ApnPreference"; diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index f80acd4b3e3e823125d34722118965ec1968240a..4661f4e6cc406882f2411ead0a1311d0ff2a6d0e 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; @@ -64,6 +62,9 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import java.util.ArrayList; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + public class ApnSettings extends RestrictedSettingsFragment implements Preference.OnPreferenceChangeListener { static final String TAG = "ApnSettings"; diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java index e4d52bc8d090e8eecd4f1d82e679869afd4ca2cc..16d382c4264ba2533ccc610b43af4bbbbc5e7c2d 100644 --- a/src/com/android/settings/network/MobileNetworkPreferenceController.java +++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java @@ -24,9 +24,6 @@ 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; @@ -40,6 +37,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class MobileNetworkPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java index f29f11c3320d6f4a85565363fe004f97dacba12b..1e74bb175d930329ce62db3130ec8a6a3b23c558 100644 --- a/src/com/android/settings/network/MobilePlanPreferenceController.java +++ b/src/com/android/settings/network/MobilePlanPreferenceController.java @@ -19,7 +19,6 @@ import static android.content.Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT; import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.os.UserHandle.myUserId; import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS; - import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction; import android.content.ActivityNotFoundException; @@ -31,7 +30,6 @@ 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; @@ -46,6 +44,8 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.List; +import androidx.preference.Preference; + public class MobilePlanPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnSaveInstanceState { diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 015f6fc631c76b6d8fdb5b0a5b9998f2f1e0cb8c..0ab38bf63c57744b5c03aa54a6e97b4b990244ca 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -25,7 +25,6 @@ import android.app.Fragment; import android.content.Context; import android.icu.text.ListFormatter; import android.provider.SearchIndexableResource; -import androidx.annotation.VisibleForTesting; import android.text.BidiFormatter; import android.util.Log; @@ -45,6 +44,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable public class NetworkDashboardFragment extends DashboardFragment implements MobilePlanPreferenceHost { diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java index 5ae3a77423eb5eafaeca3b0e6c454d61423ebe58..90ade2190f18e8d431734df6a3d037e7b51b9d05 100644 --- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java +++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java @@ -19,10 +19,11 @@ 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; +import androidx.annotation.VisibleForTesting; + public class NetworkResetRestrictionChecker { private final Context mContext; diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index 0a63adca80cb1e2c43c042de1007d04e9dc4f35c..c9d74598e5d399d00ae763435f08ab45ce0c76f3 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/src/com/android/settings/network/NetworkScorerPicker.java @@ -19,9 +19,6 @@ 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; @@ -34,6 +31,10 @@ import com.android.settings.widget.RadioButtonPreference; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Fragment for choosing default network scorer. */ diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index 98482016e4c0131176d8d43a25d841d92312fb62..8a99b63bac584ab3ee6e078debae1beec5d45142 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java @@ -18,7 +18,6 @@ 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; import com.android.settings.core.BasePreferenceController; @@ -26,6 +25,8 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.List; +import androidx.preference.Preference; + /** * {@link AbstractPreferenceController} that shows the active network scorer and toggles the * preference based on whether or not there are valid scorers installed. diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java index 0627cb305443bbfe8e6262c067513770e55992be..7bdc14e8fd096558f4f54e9e8a7bd2089f4f4f7c 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; @@ -49,10 +48,11 @@ 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; +import androidx.annotation.VisibleForTesting; + /** * Dialog to set the Private DNS */ diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 13e5bf342dc57967ad043a65c6c45c8658779227..ce3a9c0b963d12beb46ebe15028daa2e4707b7ab 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,20 +35,21 @@ import android.net.Uri; import android.os.Handler; import android.os.Looper; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; 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; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class PrivateDnsPreferenceController extends BasePreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { private static final String KEY_PRIVATE_DNS_SETTINGS = "private_dns_settings"; diff --git a/src/com/android/settings/network/ProxyPreferenceController.java b/src/com/android/settings/network/ProxyPreferenceController.java index dc2eb9f5bdb80610cf65cc0ac5a4cebc3c1a9780..a1e29c9af87517582725d7f83b3e85fb1f373265 100644 --- a/src/com/android/settings/network/ProxyPreferenceController.java +++ b/src/com/android/settings/network/ProxyPreferenceController.java @@ -17,12 +17,13 @@ package com.android.settings.network; import android.app.admin.DevicePolicyManager; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ProxyPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java index afcc184a7eee975c5dd73f8d9feeb3301a3bc14f..0b49186e2fedd41ed72e96644db3094c67f3391b 100644 --- a/src/com/android/settings/network/TetherPreferenceController.java +++ b/src/com/android/settings/network/TetherPreferenceController.java @@ -32,9 +32,6 @@ 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; import com.android.settings.R; import com.android.settings.TetherSettings; @@ -50,6 +47,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.concurrent.atomic.AtomicReference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class TetherPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnCreate, OnResume, OnPause, OnDestroy { diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 48780df2a9034d1bdecf84d0d9f89e21a0448275..452bf91cadf2de532a7a0ac53b196d0f574b29bd 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; @@ -30,16 +32,14 @@ import android.widget.Switch; import android.widget.TextView; 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 f99c47c188a36ef25a934e5302edbfce589e99a6..f6b9412704e137f3295eb7313ee9828186fdd573 100644 --- a/src/com/android/settings/nfc/AndroidBeamPreferenceController.java +++ b/src/com/android/settings/nfc/AndroidBeamPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.nfc; import android.content.Context; import android.nfc.NfcAdapter; -import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.RestrictedPreference; @@ -25,6 +24,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.PreferenceScreen; + 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 64c6d15c7ad0a333eb77ed750342f14c0d4072eb..0deaab6f353803f9981784eff8030e34d1300173 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 65ac655bd8eb5a066d291395209f7779ccf035e9..afb5616a4fa422c656176a3fd83f739ec1dc3e65 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/NfcPreferenceController.java b/src/com/android/settings/nfc/NfcPreferenceController.java index 0f68a9ce47ce68704017c0f7d0c0c6a265271d9e..d0ba58b682f42481ef1a0fc2b9f2d65278b532ad 100644 --- a/src/com/android/settings/nfc/NfcPreferenceController.java +++ b/src/com/android/settings/nfc/NfcPreferenceController.java @@ -20,16 +20,14 @@ import android.content.IntentFilter; import android.nfc.NfcAdapter; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; -import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; public class NfcPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/nfc/PaymentSettings.java b/src/com/android/settings/nfc/PaymentSettings.java index 6e03842634f3b104497621cd122db713cf334def..e78c90de77c6a4a191b82347f7aca73eb78fa053 100644 --- a/src/com/android/settings/nfc/PaymentSettings.java +++ b/src/com/android/settings/nfc/PaymentSettings.java @@ -19,6 +19,7 @@ package com.android.settings.nfc; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.pm.UserInfo; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; @@ -28,7 +29,6 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.content.pm.UserInfo; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java index 4284ecfc7969242de08b7ded6b9a954734ecf480..e12b93fe65bf9d317582abc8b5d2ef398803b80d 100644 --- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java @@ -27,7 +27,6 @@ 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; import com.android.settings.core.PreferenceControllerMixin; @@ -39,6 +38,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.preference.Preference; + abstract public class AbstractZenModeAutomaticRulePreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/AbstractZenModePreferenceController.java index 175a607b5205cd8a79f3d11fd5788f9aa19ebd0e..d8fc0e4c4be3700949c6ff54edb6359810badf82 100644 --- a/src/com/android/settings/notification/AbstractZenModePreferenceController.java +++ b/src/com/android/settings/notification/AbstractZenModePreferenceController.java @@ -29,8 +29,6 @@ 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; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.core.PreferenceControllerMixin; @@ -42,6 +40,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + abstract public class AbstractZenModePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java index 2dcc31df8a4ea84cbe157d149298fbfca5a0b298..bc605b8a07c94d943a65fec29b479967dad9b539 100644 --- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java +++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java @@ -21,14 +21,14 @@ 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; 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; + +import androidx.preference.Preference; /** * 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..0943a8a2f20983410b310b3f7afad47975731f75 100644 --- a/src/com/android/settings/notification/AllowSoundPreferenceController.java +++ b/src/com/android/settings/notification/AllowSoundPreferenceController.java @@ -22,12 +22,13 @@ import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED; import android.app.NotificationChannel; import android.content.Context; -import androidx.preference.Preference; import android.util.Log; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedSwitchPreference; +import androidx.preference.Preference; + public class AllowSoundPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/AppLinkPreferenceController.java b/src/com/android/settings/notification/AppLinkPreferenceController.java index 6e09ccebfe7e9b105d62fff606051f2ae5e2958d..b510602ad0c8a307cc50ed863fcf084bcc3337b1 100644 --- a/src/com/android/settings/notification/AppLinkPreferenceController.java +++ b/src/com/android/settings/notification/AppLinkPreferenceController.java @@ -17,10 +17,11 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; +import androidx.preference.Preference; + /** * Controls link to reach more preference settings inside the app. */ diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index 9ebcd33b7bf2b938034b7e0b0c370654b62d11d8..9d8f6f65c0e543fa6cde84cfb4e11241fc29cd0e 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -21,11 +21,6 @@ import android.app.NotificationChannelGroup; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.Log; @@ -41,6 +36,12 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** These settings are per app, so should not be returned in global search results. */ public class AppNotificationSettings extends NotificationSettingsBase { private static final String TAG = "AppNotificationSettings"; diff --git a/src/com/android/settings/notification/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..35a8f3fe0748cd2a6f933df4afa2b865fe4fcf40 100644 --- a/src/com/android/settings/notification/BadgePreferenceController.java +++ b/src/com/android/settings/notification/BadgePreferenceController.java @@ -18,14 +18,14 @@ 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; import com.android.settingslib.RestrictedSwitchPreference; +import androidx.preference.Preference; + public class BadgePreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/BadgingNotificationPreferenceController.java b/src/com/android/settings/notification/BadgingNotificationPreferenceController.java index 6576e02108fce78d2d26f89134548b48ee060fbb..dce23b35553e8f5c0eba193f45fab0ba88163464 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,11 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; - -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.settings.R; import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.InlineSwitchPayload; import com.android.settings.search.ResultPayload; @@ -40,7 +37,9 @@ 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; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; public class BadgingNotificationPreferenceController extends TogglePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, diff --git a/src/com/android/settings/notification/BlockPreferenceController.java b/src/com/android/settings/notification/BlockPreferenceController.java index 65d31193984d4bae56eca92a0f40502a53d120b8..096ec083f74856cfa9eb825b41d1caea8d820050 100644 --- a/src/com/android/settings/notification/BlockPreferenceController.java +++ b/src/com/android/settings/notification/BlockPreferenceController.java @@ -16,14 +16,12 @@ 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 com.android.settings.R; @@ -31,6 +29,8 @@ import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.SwitchBar; +import androidx.preference.Preference; + public class BlockPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/notification/BootSoundPreferenceController.java b/src/com/android/settings/notification/BootSoundPreferenceController.java index 97639b1cd56268e40b8f1fb6999150626f8f1b29..b3db7dd606be5c6d813980418b0a88672b4abdcb 100644 --- a/src/com/android/settings/notification/BootSoundPreferenceController.java +++ b/src/com/android/settings/notification/BootSoundPreferenceController.java @@ -18,12 +18,14 @@ package com.android.settings.notification; import android.content.Context; import android.os.SystemProperties; + +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.core.AbstractPreferenceController; + import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.SwitchPreference; public class BootSoundPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index c17b3b070050d27da47ed3e2206982fde09c71c9..897a49764b6917d66cac867fdabfac7ccae455da 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.NotificationChannel; import android.content.Context; -import androidx.preference.Preference; import android.util.Log; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -29,6 +28,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.preference.Preference; + public class ChannelGroupNotificationSettings extends NotificationSettingsBase { private static final String TAG = "ChannelGroupSettings"; diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 0ea0eaccff81f141c8221a9d53b921499e52a304..56508d9abb834074475c00943cc235aa7a39e95e 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -20,19 +20,19 @@ 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 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; import java.util.List; +import androidx.preference.PreferenceScreen; + public class ChannelNotificationSettings extends NotificationSettingsBase { private static final String TAG = "ChannelSettings"; diff --git a/src/com/android/settings/notification/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/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..cbc669174ac67fc11f3bd0dcef608b6933f2d409 100644 --- a/src/com/android/settings/notification/DeletedChannelsPreferenceController.java +++ b/src/com/android/settings/notification/DeletedChannelsPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import androidx.preference.Preference; + public class DeletedChannelsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/DescriptionPreferenceController.java b/src/com/android/settings/notification/DescriptionPreferenceController.java index 61a9ddb96c5a6d970009ce0ad1256ea7ea8ecf9c..bb59caedf47bea6602e3ac05361dec92ab86835d 100644 --- a/src/com/android/settings/notification/DescriptionPreferenceController.java +++ b/src/com/android/settings/notification/DescriptionPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; +import androidx.preference.Preference; + public class DescriptionPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin { 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..79efef5e9219c4181ed7bc3c5481a70cc0935c88 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; + +import androidx.preference.Preference; 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..052bbeb146d4e1b107dcc3d69939cca2bca3f744 100644 --- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java +++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java @@ -20,14 +20,15 @@ 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; import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + /** * Base class for preference controller that handles preference that enforce adjust volume * restriction diff --git a/src/com/android/settings/notification/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 1ff3c9a60c14a35a78948a3a839ea81273a959e5..bfede5d8dc0817b6d0da4f13df303d1e78396690 100644 --- a/src/com/android/settings/notification/HeaderPreferenceController.java +++ b/src/com/android/settings/notification/HeaderPreferenceController.java @@ -25,17 +25,17 @@ import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.view.View; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; -import androidx.preference.PreferenceFragment; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + public class HeaderPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, LifecycleObserver { diff --git a/src/com/android/settings/notification/ImportancePreferenceController.java b/src/com/android/settings/notification/ImportancePreferenceController.java index c05647240fc1797661102361231ef80d6bcf96c1..e9606f4eba5ca0162168a385594974f436ea30a0 100644 --- a/src/com/android/settings/notification/ImportancePreferenceController.java +++ b/src/com/android/settings/notification/ImportancePreferenceController.java @@ -26,12 +26,13 @@ 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; import com.android.settings.RestrictedListPreference; import com.android.settings.core.PreferenceControllerMixin; +import androidx.preference.Preference; + public class ImportancePreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LightsPreferenceController.java b/src/com/android/settings/notification/LightsPreferenceController.java index 3710cc5a9962fa2e7f3bdfb10462906da4d7f375..fa35bfd2cc2c64a64174e0ccff4e4197d874fa3f 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; + +import androidx.preference.Preference; public class LightsPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java index 518d2a949bbd2610e1e714acea7d36259b47e25f..a05e27b024018afb3e5189db24a74066defac6df 100644 --- a/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java +++ b/src/com/android/settings/notification/LockScreenNotificationPreferenceController.java @@ -28,8 +28,6 @@ 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; @@ -47,6 +45,9 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.ArrayList; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class LockScreenNotificationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/NotificationAppPreference.java b/src/com/android/settings/notification/NotificationAppPreference.java index bb015ca3f25732e82007448f013b97cb385e356b..9cc934537b64a0aaba95a5fb0d4f018746458242 100644 --- a/src/com/android/settings/notification/NotificationAppPreference.java +++ b/src/com/android/settings/notification/NotificationAppPreference.java @@ -16,7 +16,6 @@ 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; @@ -25,6 +24,8 @@ import com.android.settings.R; import com.android.settings.widget.MasterSwitchPreference; import com.android.settingslib.RestrictedLockUtils; +import androidx.preference.PreferenceViewHolder; + /** * Shows an app icon, title and summary. Has a second switch touch target. */ diff --git a/src/com/android/settings/notification/NotificationFooterPreference.java b/src/com/android/settings/notification/NotificationFooterPreference.java index 2b41281c5101e606c98e20cc3bfc5a743694a051..d3d29a3621c7a04873e610bfb9fb4502e66ab139 100644 --- a/src/com/android/settings/notification/NotificationFooterPreference.java +++ b/src/com/android/settings/notification/NotificationFooterPreference.java @@ -17,15 +17,16 @@ 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 com.android.settingslib.R; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * FooterPreference that can have any key or ordering. */ diff --git a/src/com/android/settings/notification/NotificationLockscreenPreference.java b/src/com/android/settings/notification/NotificationLockscreenPreference.java index 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 1ce42c28433b31ff7b97744569e61a337d8f0f94..90dd852def50081e957c4aed63e944656942c100 100644 --- a/src/com/android/settings/notification/NotificationPreferenceController.java +++ b/src/com/android/settings/notification/NotificationPreferenceController.java @@ -25,9 +25,6 @@ import android.app.NotificationManager; import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.util.Log; import com.android.settingslib.RestrictedLockUtils; @@ -35,6 +32,9 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.Objects; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; + /** * Parent class for preferences appearing on notification setting pages at the app, * notification channel group, or notification channel level. diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java index e1c58767f5133d0e829dac6d9f002ead4aaa686f..ccef26279e725450103c7cabfcba6b7f1f159f19 100644 --- a/src/com/android/settings/notification/NotificationSettingsBase.java +++ b/src/com/android/settings/notification/NotificationSettingsBase.java @@ -36,9 +36,6 @@ 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; @@ -55,6 +52,10 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + abstract public class NotificationSettingsBase extends DashboardFragment { private static final String TAG = "NotifiSettingsBase"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java index e63e5886461cf5146da65c9ecf863a7c9eea43cd..428837304cd594141f60ddbf0f359cc92ac30f46 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; @@ -60,9 +57,12 @@ 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; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + public class NotificationStation extends SettingsPreferenceFragment { private static final String TAG = NotificationStation.class.getSimpleName(); diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java index ede7d881f96b6791ecc77b7a5debf314e6d5532e..d9c339b5c667cf8e864ac042fdb2928c5d407265 100644 --- a/src/com/android/settings/notification/NotificationSwitchBarPreference.java +++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java @@ -17,7 +17,6 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; @@ -25,6 +24,8 @@ import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.ToggleSwitch; import com.android.settingslib.RestrictedLockUtils; +import androidx.preference.PreferenceViewHolder; + public class NotificationSwitchBarPreference extends LayoutPreference { private ToggleSwitch mSwitch; private boolean mChecked; diff --git a/src/com/android/settings/notification/NotificationsOffPreferenceController.java b/src/com/android/settings/notification/NotificationsOffPreferenceController.java index 4dbf4917641b078ae379f0c778f17c08324662c9..99f6063f2c85a51aac30c487e15ff38c43c144bf 100644 --- a/src/com/android/settings/notification/NotificationsOffPreferenceController.java +++ b/src/com/android/settings/notification/NotificationsOffPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; +import androidx.preference.Preference; + public class NotificationsOffPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/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/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java index 9b142bbc93365991236daf063f6bda4951c0e2d7..c014ae73a535737b9552faa8dd62031d7368ed6e 100644 --- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java +++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java @@ -24,10 +24,6 @@ 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; @@ -52,6 +48,11 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** * This controller displays a list of recently used apps and a "See all" button. If there is * no recently used app, "See all" will be displayed as "Notifications". diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java index 517c0410b31e1766d4a2fc6fe2a2401c511b2cac..b6025432c1fb3ea71ae64a61e6534804a40b273a 100644 --- a/src/com/android/settings/notification/RedactionInterstitial.java +++ b/src/com/android/settings/notification/RedactionInterstitial.java @@ -20,7 +20,6 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTI import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; - import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import android.content.Context; diff --git a/src/com/android/settings/notification/RingVolumePreferenceController.java b/src/com/android/settings/notification/RingVolumePreferenceController.java index cc1bf09d2fa8d0724303fbfdf5c5ceb043eaa212..e2668a3c19dfe9b2460c9ea1e81a592caa5299b7 100644 --- a/src/com/android/settings/notification/RingVolumePreferenceController.java +++ b/src/com/android/settings/notification/RingVolumePreferenceController.java @@ -17,8 +17,6 @@ package com.android.settings.notification; import android.app.NotificationManager; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -37,6 +35,8 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.Objects; +import androidx.lifecycle.OnLifecycleEvent; + public class RingVolumePreferenceController extends VolumeSeekBarPreferenceController { private static final String TAG = "RingVolumeController"; diff --git a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java index 21b7e539a18a353caaeef86659c5e1ebbddde07c..e7fffd1bacf095fb148e33b7227ef15ae01fb272 100644 --- a/src/com/android/settings/notification/RingtonePreferenceControllerBase.java +++ b/src/com/android/settings/notification/RingtonePreferenceControllerBase.java @@ -20,11 +20,12 @@ 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; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public abstract class RingtonePreferenceControllerBase extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/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..a651e6ac6554f20d00fd8d401bd1a3840760d17b 100644 --- a/src/com/android/settings/notification/SettingPref.java +++ b/src/com/android/settings/notification/SettingPref.java @@ -22,13 +22,14 @@ import android.content.res.Resources; import android.net.Uri; import android.provider.Settings.Global; import android.provider.Settings.System; + +import com.android.settings.SettingsPreferenceFragment; + import androidx.preference.DropDownPreference; import androidx.preference.Preference; import androidx.preference.Preference.OnPreferenceChangeListener; import androidx.preference.TwoStatePreference; -import com.android.settings.SettingsPreferenceFragment; - /** Helper to manage a two-state or dropdown preference bound to a global or system setting. */ public class SettingPref { public static final int TYPE_GLOBAL = 1; diff --git a/src/com/android/settings/notification/SettingPrefController.java b/src/com/android/settings/notification/SettingPrefController.java index 891c7b3f8fa91b347d849f62d55b9a480949ca44..89c9871e8b5e3c3fa27bc1b4e37e03bbb9dcfcdf 100644 --- a/src/com/android/settings/notification/SettingPrefController.java +++ b/src/com/android/settings/notification/SettingPrefController.java @@ -18,12 +18,9 @@ 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; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.SettingsPreferenceFragment; @@ -34,6 +31,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class SettingPrefController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/SoundPreferenceController.java b/src/com/android/settings/notification/SoundPreferenceController.java index 6c537ff0d26467f2091bdd29ab282aa8788a9429..2a21bcbe01e94b3b738072c9863be71a7b20c684 100644 --- a/src/com/android/settings/notification/SoundPreferenceController.java +++ b/src/com/android/settings/notification/SoundPreferenceController.java @@ -22,12 +22,13 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.preference.PreferenceManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.core.PreferenceControllerMixin; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class SoundPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener, PreferenceManager.OnActivityResultListener { 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 ae111b2081208c3f0200f816ff48661fb594496b..2bd2c27adf38b42845a41915e5f6451ca005e4a0 100644 --- a/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java +++ b/src/com/android/settings/notification/VibrateWhenRingPreferenceController.java @@ -26,15 +26,15 @@ import android.os.Handler; import android.provider.Settings; import android.text.TextUtils; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.Utils; import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class VibrateWhenRingPreferenceController extends TogglePreferenceController implements LifecycleObserver, OnResume, OnPause { diff --git a/src/com/android/settings/notification/VibrationPreferenceController.java b/src/com/android/settings/notification/VibrationPreferenceController.java index 04aa201a587b8941cc2460e313dfe8a0376cd59c..75a19a9cb1935eee0d91659b3cd36f41d7860af1 100644 --- a/src/com/android/settings/notification/VibrationPreferenceController.java +++ b/src/com/android/settings/notification/VibrationPreferenceController.java @@ -16,15 +16,15 @@ 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; import com.android.settingslib.RestrictedSwitchPreference; +import androidx.preference.Preference; + public class VibrationPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java index e1b067bc378974f5e1d40eac50a98eda93ab3b64..cd2ebd910a42146d71959964f28e49457316283f 100644 --- a/src/com/android/settings/notification/VisibilityPreferenceController.java +++ b/src/com/android/settings/notification/VisibilityPreferenceController.java @@ -25,7 +25,6 @@ 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; import com.android.settings.R; @@ -35,6 +34,8 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.ArrayList; +import androidx.preference.Preference; + public class VisibilityPreferenceController extends NotificationPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java index ee02b628b084b8f3d27741d3968846d30504706a..6c84fba392db8ce8a79c51f8d6037ea622ab3a44 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreference.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java @@ -21,11 +21,8 @@ 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; @@ -36,6 +33,9 @@ import com.android.settings.widget.SeekBarPreference; import java.util.Objects; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + /** A slider preference that directly controls an audio stream volume (no dialog) **/ public class VolumeSeekBarPreference extends SeekBarPreference { private static final String TAG = "VolumeSeekBarPreference"; diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java index 720fddd7208f2d02ec4703aba8b40bbd48abd1e1..62a0e2ef9e3a9bb08b5fa7f5d5143e392b364383 100644 --- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java +++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java @@ -16,15 +16,16 @@ package com.android.settings.notification; -import androidx.lifecycle.LifecycleObserver; -import androidx.lifecycle.OnLifecycleEvent; import android.content.Context; -import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.notification.VolumeSeekBarPreference.Callback; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.OnLifecycleEvent; +import androidx.preference.PreferenceScreen; + /** * Base class for preference controller that handles VolumeSeekBarPreference */ diff --git a/src/com/android/settings/notification/ZenAccessSettings.java b/src/com/android/settings/notification/ZenAccessSettings.java index 62c9315f8ab0943703aaf09ac3d8cf3af21015ad..8c69f63c1906d8d0170f3f07ae1bca923d9e7d13 100644 --- a/src/com/android/settings/notification/ZenAccessSettings.java +++ b/src/com/android/settings/notification/ZenAccessSettings.java @@ -37,10 +37,6 @@ 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; @@ -57,6 +53,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class ZenAccessSettings extends EmptyTextSettings { private final String TAG = "ZenAccessSettings"; diff --git a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java index 8a097a59327469b982d8172200353f3a1b524fde..9fe463bb63782d90990850a78427e318ce3f3336 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleHeaderPreferenceController.java @@ -25,8 +25,6 @@ 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; @@ -37,6 +35,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; + public class ZenAutomaticRuleHeaderPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java index 599af2682479c8147e958f347fb4cc2711f3c010..7b288b9066ab375c3bac459a1ae24ad32c514032 100644 --- a/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java +++ b/src/com/android/settings/notification/ZenAutomaticRuleSwitchPreferenceController.java @@ -19,8 +19,6 @@ package com.android.settings.notification; import android.app.AutomaticZenRule; import android.app.Fragment; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.widget.Switch; import com.android.settings.R; @@ -28,6 +26,9 @@ import com.android.settings.applications.LayoutPreference; import com.android.settings.widget.SwitchBar; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenAutomaticRuleSwitchPreferenceController extends AbstractZenModeAutomaticRulePreferenceController implements SwitchBar.OnSwitchChangeListener { diff --git a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java index c28b7b445636de2640d968331dabc7a3cbd48a39..ad66265445364e84ae31091ef5746717ebff4126 100644 --- a/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java +++ b/src/com/android/settings/notification/ZenCustomRadioButtonPreference.java @@ -17,7 +17,6 @@ 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; @@ -25,6 +24,8 @@ import android.widget.RadioButton; import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; +import androidx.preference.PreferenceViewHolder; + /** * A radio button preference with a divider and a settings icon that links to another screen. */ diff --git a/src/com/android/settings/notification/ZenFooterPreferenceController.java b/src/com/android/settings/notification/ZenFooterPreferenceController.java index a00ac6a346c0dddeee2f6b9c0f96cdbb5ca5dc5f..be66f26ab64a34d98eb8a59e6ec13964b9e53941 100644 --- a/src/com/android/settings/notification/ZenFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenFooterPreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenFooterPreferenceController extends AbstractZenModePreferenceController { public ZenFooterPreferenceController(Context context, Lifecycle lifecycle, diff --git a/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java b/src/com/android/settings/notification/ZenModeAddAutomaticRulePreferenceController.java index 8898b055c245f9b72075cb039d18cffa4007f4c4..9935f40006a0236d691f0ddebcfaee6f2d528f59 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; + +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; 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..8d844d1d84f0e6e282035b73e7328ab282108863 100644 --- a/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAlarmsPreferenceController.java @@ -19,13 +19,14 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ZenModeAlarmsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java index 2ea46392c7bd65d8534c067baa14098dd467e850..fba24b12df98579b46869e60e9f6f6e73516168b 100644 --- a/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceController.java @@ -19,15 +19,16 @@ 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; -import androidx.preference.PreferenceScreen; import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.Map; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + public class ZenModeAutomaticRulesPreferenceController extends AbstractZenModeAutomaticRulePreferenceController { diff --git a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java index faa0f8a19609b272c1f912017daadf31c9f8f732..d747e8c2a3ee4c3508dad011d9abb3b514846876 100644 --- a/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeAutomationPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class ZenModeAutomationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeBackend.java b/src/com/android/settings/notification/ZenModeBackend.java index 8c8f14df67194d1fff31b6c14c6bc3933f90ab84..8242e3e98838b687e9774627cfa78402b95aa190 100644 --- a/src/com/android/settings/notification/ZenModeBackend.java +++ b/src/com/android/settings/notification/ZenModeBackend.java @@ -26,11 +26,12 @@ 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 com.android.settings.R; +import androidx.annotation.VisibleForTesting; + public class ZenModeBackend { @VisibleForTesting protected static final String ZEN_MODE_FROM_ANYONE = "zen_mode_from_anyone"; diff --git a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java index 4ab14379e92766ba39ced881a29b8db2d1b6e54c..55c621f4b4738aee1fdfa3414d8f3f151c96f0b6 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; + public class ZenModeBehaviorCallsPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java index 1a6a3b4357c0d9d95ad2bab3ba950db32d03e081..5353e91575f8f22c50278d176352ec1b95c3ec77 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceController.java @@ -21,12 +21,12 @@ import android.content.Context; import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import androidx.preference.Preference; -import android.util.Slog; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; + public class ZenModeBehaviorFooterPreferenceController extends AbstractZenModePreferenceController { protected static final String KEY = "footer_preference"; diff --git a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java index d11baee8e8b7c48d20edba8f4990ff90a94b358e..9346654981918af66aa05451f563f62e6fec1cb1 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; + public class ZenModeBehaviorMsgEventReminderPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java index 3d250639e18f7b5740bf129e788cac863cc00d0d..16426ffebe6c6320ed1953178fc88d66de2a84fb 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceController.java @@ -17,11 +17,12 @@ package com.android.settings.notification; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; + public class ZenModeBehaviorSoundPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/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 340f9e1db20cc4b6ed36aab2894a7ad97eec07d2..2bda243e6e75a407d9a758fe6086489a52118510 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..c1f0eda91668dcaf84a73f91cafa23bef6555557 100644 --- a/src/com/android/settings/notification/ZenModeButtonPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeButtonPreferenceController.java @@ -19,7 +19,6 @@ 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; @@ -29,6 +28,8 @@ import com.android.settings.applications.LayoutPreference; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; + public class ZenModeButtonPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java index 1b6c122be44fb3d1a0bd33e98fa6eb7f3f1b23f5..0623b00b755109809ca83af7ad893e2164145fd0 100644 --- a/src/com/android/settings/notification/ZenModeCallsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeCallsPreferenceController.java @@ -19,15 +19,16 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -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; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeCallsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java index 5e58444efbdc520b243c1bc8b5fb21de503956cf..baee2cd530b8996ac4938a29a986b4bc1d0d13e0 100644 --- a/src/com/android/settings/notification/ZenModeDurationPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeDurationPreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.notification; import android.app.FragmentManager; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeDurationPreferenceController extends AbstractZenModePreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceClickListener { diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index 51ea51780d58d447171ca86f3912df1e4b0b974d..9d1d49bd06dd79bae8970c559ebe7e784328ca59 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -26,10 +26,6 @@ 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; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -40,6 +36,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; + public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { private static final String KEY_CALENDAR = "calendar"; private static final String KEY_REPLY = "reply"; diff --git a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java index 8ca6cf63dfdfbe184ca2a005212ef5e554f00218..e1aa28cdfd0a18c858079ea8a2f6dfd3742f6db6 100644 --- a/src/com/android/settings/notification/ZenModeEventsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeEventsPreferenceController.java @@ -19,14 +19,14 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ZenModeEventsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java index d8099bed210d7444a1004fd205a7899c137cf11b..d4b9371433f9ebf8eba9512fb7a65efd9c1be14d 100644 --- a/src/com/android/settings/notification/ZenModeMediaPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMediaPreferenceController.java @@ -19,12 +19,13 @@ 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 com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ZenModeMediaPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java index 5939abbce53d12f934c92207006f9671f4dc3b7a..ba4fa0468320abddc1bff78c77ccfd550033e30e 100644 --- a/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeMessagesPreferenceController.java @@ -3,15 +3,16 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -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; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeMessagesPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java index c0f319afaf65d0e7b914083babe7444e5a2c7b09..cc332f62b7f28935fc59794e7d1db5d1a38bec56 100644 --- a/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRemindersPreferenceController.java @@ -19,13 +19,14 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ZenModeRemindersPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java index e3f5c2f7ac4b03999cf862dd8b9cf247f5a96f85..4a384b154b3739d2b17279b27ec7f642ceb3bec3 100644 --- a/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java @@ -19,15 +19,16 @@ 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 androidx.preference.PreferenceScreen; import android.util.Log; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java index 576da167295a7bd347d0400d5a96835de23f9810..0aaf310b6b27a0bf5f02727eb638da86d6b6ffc5 100644 --- a/src/com/android/settings/notification/ZenModeRuleSettingsBase.java +++ b/src/com/android/settings/notification/ZenModeRuleSettingsBase.java @@ -23,14 +23,15 @@ 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 com.android.settings.R; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class ZenModeRuleSettingsBase extends ZenModeSettingsBase { protected static final String TAG = ZenModeSettingsBase.TAG; diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 50ecd8bd09e3a737d04adbd1fe6067a225d4c914..a235603f5d0b5a564f75a2e3c53c1c3eebbb8602 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -28,10 +28,6 @@ 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; @@ -47,6 +43,11 @@ import java.util.Arrays; import java.util.Calendar; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { private static final String KEY_DAYS = "days"; private static final String KEY_START_TIME = "start_time"; diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index e05dabe2b617eb5bd605cd1b7fc351363c8cdb98..26b0e8dfe23cf9084ed8256cc1e57edae2658dfe 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -35,9 +35,6 @@ import android.provider.SearchIndexableResource; import android.provider.Settings; import android.service.notification.ZenModeConfig; -import androidx.annotation.VisibleForTesting; -import androidx.preference.CheckBoxPreference; - import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.search.BaseSearchIndexProvider; @@ -53,6 +50,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.function.Predicate; +import androidx.annotation.VisibleForTesting; + @SearchIndexable public class ZenModeSettings extends ZenModeSettingsBase { @Override diff --git a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java index c21f23dac6e5772c433051bc0eff077c95116d9f..462320fa3a6eb059440f7690cd3900785fe2d762 100644 --- a/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceController.java @@ -20,11 +20,12 @@ 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; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; + public class ZenModeSettingsFooterPreferenceController extends AbstractZenModePreferenceController { protected static final String KEY = "footer_preference"; diff --git a/src/com/android/settings/notification/ZenModeSliceBuilder.java b/src/com/android/settings/notification/ZenModeSliceBuilder.java index 1d2c146fb99a9c714f22b087df1bd33e481ef570..a061e2c4a1fc495d62c8d1efaa2cddaf26e1f6d3 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; diff --git a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java index 10a7b561353fa5887542bdb42647cfb243a4dd03..a5137f1f5ce1cdda222dd246fc68aea44cf989e3 100644 --- a/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeStarredContactsPreferenceController.java @@ -27,8 +27,6 @@ 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; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; @@ -37,6 +35,9 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeStarredContactsPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceClickListener { diff --git a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java index b41f11e3cf3e5a310a52ffe89883d92c6eb05295..36b017f68d9f85350cd0d0edc6e6de9e6d9216ef 100644 --- a/src/com/android/settings/notification/ZenModeSystemPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeSystemPreferenceController.java @@ -19,13 +19,14 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class ZenModeSystemPreferenceController extends AbstractZenModePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectPreferenceController.java index 4c49224bc77fb2a2fb0e07e01573900ddae97c1d..37cf99c97ade9cc58c656f000273cc4fc192d0fd 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; + +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; public class ZenModeVisEffectPreferenceController extends AbstractZenModePreferenceController diff --git a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java index d7de0d95e9f6487a6dfc36663335e28706700bb5..00d2477d73e8d7901170a201b52c4e0bd76ca902 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeVisEffectsAllPreferenceController extends AbstractZenModePreferenceController implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener { diff --git a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java index 228530874f062b5b8169b77d3ddea51e90b80f4e..86790f2852f5a39aa1f0dc1967ec0f3c3f07519c 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java @@ -18,14 +18,15 @@ package com.android.settings.notification; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeVisEffectsCustomPreferenceController extends AbstractZenModePreferenceController { diff --git a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java index 580fb5d0520c6b4fe91195fe3efa08185669ba4e..a266141b70beff383d00791495860371d38fedd9 100644 --- a/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java +++ b/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceController.java @@ -18,12 +18,13 @@ package com.android.settings.notification; import android.app.NotificationManager.Policy; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settingslib.core.lifecycle.Lifecycle; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ZenModeVisEffectsNonePreferenceController extends AbstractZenModePreferenceController implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener { 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..60e4bdeebac6ddbb551ffd7296b33f1525a438dd 100644 --- a/src/com/android/settings/notification/ZenRulePreference.java +++ b/src/com/android/settings/notification/ZenRulePreference.java @@ -24,8 +24,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ServiceInfo; import android.service.notification.ZenModeConfig; -import androidx.preference.Preference; -import androidx.preference.PreferenceViewHolder; import android.view.View; import com.android.internal.logging.nano.MetricsProto; @@ -37,6 +35,9 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.Map; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class ZenRulePreference extends TwoTargetPreference { private static final ManagedServiceSettings.Config CONFIG = ZenModeAutomationSettings.getConditionProviderConfig(); diff --git a/src/com/android/settings/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 39380ea211114f4c29540cae88d9e32b8bdf6542..1dc8baadcee62bba71aceca96ee3d331c0687a95 100644 --- a/src/com/android/settings/password/ChooseLockGeneric.java +++ b/src/com/android/settings/password/ChooseLockGeneric.java @@ -18,8 +18,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; @@ -38,10 +38,6 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; -import androidx.annotation.StringRes; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import android.util.EventLog; import android.util.Log; @@ -65,6 +61,11 @@ import com.android.settingslib.RestrictedPreference; import java.util.List; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ChooseLockGeneric extends SettingsActivity { public static final String CONFIRM_CREDENTIALS = "confirm_credentials"; diff --git a/src/com/android/settings/password/ChooseLockGenericController.java b/src/com/android/settings/password/ChooseLockGenericController.java index 2550510a3e67c75b2e2cca2642f2260a2202d632..9677a439aadecd4a4f4562fbfd65e5329038f7ea 100644 --- a/src/com/android/settings/password/ChooseLockGenericController.java +++ b/src/com/android/settings/password/ChooseLockGenericController.java @@ -19,14 +19,15 @@ 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; import com.android.settings.R; import java.util.ArrayList; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + /** * A controller for ChooseLockGeneric, and other similar classes which shows a list of possible * screen locks for the user to choose from. diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java index 1013c44700ee66ef3198f8a89fc338feca6bead4..81ea68054969a5b42daa96e353fc051c4da35a49 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; @@ -72,6 +69,10 @@ import com.android.setupwizardlib.GlifLayout; import java.util.ArrayList; import java.util.List; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + public class ChooseLockPassword extends SettingsActivity { private static final String TAG = "ChooseLockPassword"; diff --git a/src/com/android/settings/password/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..62ddd75a2ad334bf51d0b375084fd7f30479e3bd 100644 --- a/src/com/android/settings/password/PasswordRequirementAdapter.java +++ b/src/com/android/settings/password/PasswordRequirementAdapter.java @@ -16,7 +16,6 @@ package com.android.settings.password; -import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -25,6 +24,8 @@ import android.widget.TextView; import com.android.settings.R; import com.android.settings.password.PasswordRequirementAdapter.PasswordRequirementViewHolder; +import androidx.recyclerview.widget.RecyclerView; + /** * Used in {@link ChooseLockPassword} to show password requirements. */ diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index 3edb08301b3ab6cddc431f537d41d5c01d778076..4258d76b6244902ce5c6053e2dee4525610bc93d 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -22,9 +22,6 @@ 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; @@ -38,6 +35,10 @@ import com.android.settings.fingerprint.SetupFingerprintEnrollFindSensor; import com.android.settings.utils.SettingsDividerItemDecoration; import com.android.setupwizardlib.GlifPreferenceLayout; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.recyclerview.widget.RecyclerView; + /** * Setup Wizard's version of ChooseLockGeneric screen. It inherits the logic and basic structure * from ChooseLockGeneric class, and should remain similar to that behaviorally. This class should diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java index 56b66a324aacf85f3898c5cd7364c2352953e5b1..f900e9a78388cbcd52019d4b4977fb055609d03c 100644 --- a/src/com/android/settings/password/SetupChooseLockPassword.java +++ b/src/com/android/settings/password/SetupChooseLockPassword.java @@ -22,7 +22,6 @@ 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; @@ -32,6 +31,8 @@ import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener; +import androidx.annotation.Nullable; + /** * Setup Wizard's version of ChooseLockPassword screen. It inherits the logic and basic structure * from ChooseLockPassword class, and should remain similar to that behaviorally. This class should diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java index 4d4119f8fd3103af7ee5e3fccdcdb8906619da3c..26e19909637ce9c3eecfe05f4b0ea0be8c34a7f3 100644 --- a/src/com/android/settings/password/SetupChooseLockPattern.java +++ b/src/com/android/settings/password/SetupChooseLockPattern.java @@ -20,7 +20,6 @@ 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; @@ -29,6 +28,8 @@ import android.widget.Button; import com.android.settings.R; import com.android.settings.SetupRedactionInterstitial; +import androidx.annotation.Nullable; + /** * Setup Wizard's version of ChooseLockPattern screen. It inherits the logic and basic structure * from ChooseLockPattern class, and should remain similar to that behaviorally. This class should diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java index f5396c4efd292c030a99c754e5831b68cc6cf9c8..fff6ad107ee2081331447f4588246e426b61b83a 100644 --- a/src/com/android/settings/password/SetupSkipDialog.java +++ b/src/com/android/settings/password/SetupSkipDialog.java @@ -22,12 +22,13 @@ 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; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; +import androidx.annotation.NonNull; + public class SetupSkipDialog extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/print/PrintJobSettingsFragment.java b/src/com/android/settings/print/PrintJobSettingsFragment.java index bb50d0af259ee1372b8b68bc2b77a51bc2f42d32..10759cedf09b324110f587c9669cfbaff20bd20c 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; @@ -42,6 +41,8 @@ import com.android.settings.SettingsPreferenceFragment; import java.text.DateFormat; +import androidx.preference.Preference; + /** * Fragment for management of a print job. */ diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java index 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..3bd80fdf6cd7b708d10fefe6bfa9527c2edb3f63 100644 --- a/src/com/android/settings/print/PrintSettingPreferenceController.java +++ b/src/com/android/settings/print/PrintSettingPreferenceController.java @@ -24,8 +24,6 @@ import android.print.PrintJobId; import android.print.PrintJobInfo; import android.print.PrintManager; import android.printservice.PrintServiceInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -36,6 +34,9 @@ import com.android.settingslib.core.lifecycle.events.OnStop; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * {@link BasePreferenceController} for Print settings. */ diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java index bad1e035dccfce1cb2d7540a2f7ecd0df5b8eea1..dd976678ffca24e41932c9b327532c1d257fa8e9 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; @@ -63,6 +61,9 @@ import java.text.DateFormat; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + /** * Fragment with the top level print settings. */ diff --git a/src/com/android/settings/search/BaseSearchIndexProvider.java b/src/com/android/settings/search/BaseSearchIndexProvider.java index 3864750a67b0dcd5c48d9cc029405762b52359ef..fcfa8aadb6a60fc43bd8f4c2861b64be2cd1ce0e 100644 --- a/src/com/android/settings/search/BaseSearchIndexProvider.java +++ b/src/com/android/settings/search/BaseSearchIndexProvider.java @@ -20,8 +20,6 @@ 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; @@ -40,6 +38,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import androidx.annotation.CallSuper; +import androidx.annotation.VisibleForTesting; + /** * A basic SearchIndexProvider that returns no data to index. */ diff --git a/src/com/android/settings/search/DatabaseIndexingManager.java b/src/com/android/settings/search/DatabaseIndexingManager.java index e793cac5475ecfe846bd2c5d11500a861da86054..07feaf39dea171122ba174de381c3d034e46e880 100644 --- a/src/com/android/settings/search/DatabaseIndexingManager.java +++ b/src/com/android/settings/search/DatabaseIndexingManager.java @@ -55,11 +55,9 @@ 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 com.android.settings.search.indexing.IndexData; import com.android.settings.search.indexing.IndexDataConverter; import com.android.settings.search.indexing.PreIndexData; @@ -70,6 +68,8 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import androidx.annotation.VisibleForTesting; + /** * Consumes the SearchIndexableProvider content providers. * Updates the Resource, Raw Data and non-indexable data for Search. diff --git a/src/com/android/settings/search/DeviceIndexUpdateJobService.java b/src/com/android/settings/search/DeviceIndexUpdateJobService.java index 3eb904119bc7a90e60d77cc3156458c010b5dc43..99b15302642824ff35e7e68b9a8271cfb76437f0 100644 --- a/src/com/android/settings/search/DeviceIndexUpdateJobService.java +++ b/src/com/android/settings/search/DeviceIndexUpdateJobService.java @@ -38,9 +38,9 @@ import java.util.concurrent.CountDownLatch; import androidx.slice.Slice; import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; import androidx.slice.SliceViewManager; import androidx.slice.SliceViewManager.SliceCallback; -import androidx.slice.SliceMetadata; import androidx.slice.core.SliceQuery; import androidx.slice.widget.ListContent; diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index 7c87bf74f61378d8a6a5f8278caec7472cf35099..7d3c3035f381c769d52fec4555329e2b22edc2bf 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -23,12 +23,13 @@ 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 java.util.List; +import androidx.annotation.VisibleForTesting; + public class IndexDatabaseHelper extends SQLiteOpenHelper { private static final String TAG = "IndexDatabaseHelper"; 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/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java index b9134e5c98549127711c1f284888471ecbad737b..97f724050d4d23807e9a4233db85a81bb9f4286b 100644 --- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java +++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java @@ -41,7 +41,6 @@ import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS; import static android.provider.SearchIndexablesContract.INDEXABLES_XML_RES_COLUMNS; import static android.provider.SearchIndexablesContract.NON_INDEXABLES_KEYS_COLUMNS; import static android.provider.SearchIndexablesContract.SITE_MAP_COLUMNS; - import static com.android.settings.dashboard.DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP; import android.content.Context; diff --git a/src/com/android/settings/search/indexing/IndexDataConverter.java b/src/com/android/settings/search/indexing/IndexDataConverter.java index 8aa84fa515e2971bcd074c8372ba170472cb6ec7..6852653eb0b18d0d2087db2c12d8119b8f41bf20 100644 --- a/src/com/android/settings/search/indexing/IndexDataConverter.java +++ b/src/com/android/settings/search/indexing/IndexDataConverter.java @@ -23,14 +23,13 @@ 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 com.android.settings.core.PreferenceXmlParserUtils; +import com.android.settings.search.DatabaseIndexingUtils; import com.android.settings.search.ResultPayload; import com.android.settings.search.SearchIndexableRaw; @@ -45,6 +44,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.annotation.DrawableRes; + /** * Helper class to convert {@link PreIndexData} to {@link IndexData}. */ 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 7b00ea1f9be61f4fc77f23fd4bc3670996b27ac6..47bd0b8e47f0e85d6519aa20573befea0093da1a 100644 --- a/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java @@ -21,7 +21,6 @@ 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 com.android.settings.R; @@ -29,6 +28,8 @@ import com.android.settings.Utils; import com.android.settings.core.SubSettingLauncher; import com.android.settings.password.ChooseLockGeneric; +import androidx.preference.Preference; + public class ChangeProfileScreenLockPreferenceController extends ChangeScreenLockPreferenceController { diff --git a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java index 5b2216ebc8a32b67c93ef3dd5ab68e84722b2650..156e230c6b55a9123e8bb01b5684d67cc714d4a2 100644 --- a/src/com/android/settings/security/ChangeScreenLockPreferenceController.java +++ b/src/com/android/settings/security/ChangeScreenLockPreferenceController.java @@ -21,8 +21,6 @@ import android.content.Context; import android.os.UserHandle; import android.os.UserManager; import android.os.storage.StorageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; @@ -38,6 +36,9 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class ChangeScreenLockPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, GearPreference.OnGearClickListener { diff --git a/src/com/android/settings/security/ConfigureKeyGuardDialog.java b/src/com/android/settings/security/ConfigureKeyGuardDialog.java index f5d9068729a49d5eef00bbdc2949610dfa14e329..3bcfb89ce5c0ab46741d1ba1c22b9bb9f5402f2f 100644 --- a/src/com/android/settings/security/ConfigureKeyGuardDialog.java +++ b/src/com/android/settings/security/ConfigureKeyGuardDialog.java @@ -23,7 +23,6 @@ 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; import com.android.settings.CredentialStorage; @@ -31,6 +30,8 @@ import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.password.ChooseLockGeneric; +import androidx.annotation.VisibleForTesting; + /** * Prompt for key guard configuration confirmation. */ diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java index 3bf61f63c1a28c086c4130984b0417c50bb441f4..1df5e9e29026d1ab343830b9187f64ee15a34df1 100644 --- a/src/com/android/settings/security/CredentialStoragePreferenceController.java +++ b/src/com/android/settings/security/CredentialStoragePreferenceController.java @@ -19,10 +19,11 @@ 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; +import androidx.preference.Preference; + public class CredentialStoragePreferenceController extends RestrictedEncryptionPreferenceController { diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java index 72ae0a797432f0a41c0a3a4bbf64262ecf044477..97669114678c37d510ca0448fcebb372801dffca 100644 --- a/src/com/android/settings/security/CryptKeeperSettings.java +++ b/src/com/android/settings/security/CryptKeeperSettings.java @@ -28,7 +28,6 @@ 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; @@ -43,6 +42,8 @@ import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.password.ChooseLockSettingsHelper; import com.android.settings.password.ConfirmLockPattern; +import androidx.preference.Preference; + public class CryptKeeperSettings extends InstrumentedPreferenceFragment { private static final String TAG = "CryptKeeper"; private static final String TYPE = "type"; diff --git a/src/com/android/settings/security/EncryptionStatusPreferenceController.java b/src/com/android/settings/security/EncryptionStatusPreferenceController.java index 27e896aff3966bd31292f3e62b5a67796ff1612e..4128358310e71a94b18f90d26b73ab40c9aaffa6 100644 --- a/src/com/android/settings/security/EncryptionStatusPreferenceController.java +++ b/src/com/android/settings/security/EncryptionStatusPreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.security; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; +import androidx.preference.Preference; + public class EncryptionStatusPreferenceController extends BasePreferenceController { diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java index 6e3328aa9f82f2aaa0e588766070d4b670aed126..57fe6164227600b7b79eaff80e09c6b7c1282e53 100644 --- a/src/com/android/settings/security/LockUnificationPreferenceController.java +++ b/src/com/android/settings/security/LockUnificationPreferenceController.java @@ -27,8 +27,6 @@ import android.content.Intent; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -42,6 +40,9 @@ import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedSwitchPreference; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class LockUnificationPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/OwnerInfoPreferenceController.java b/src/com/android/settings/security/OwnerInfoPreferenceController.java index 01a02900e520566d0fb3144ac13d6eecef9faacc..19b1dd18556a33389ca7109add646dcabf886afb 100644 --- a/src/com/android/settings/security/OwnerInfoPreferenceController.java +++ b/src/com/android/settings/security/OwnerInfoPreferenceController.java @@ -18,10 +18,6 @@ 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; -import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; @@ -34,6 +30,11 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + public class OwnerInfoPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnResume { diff --git a/src/com/android/settings/security/ResetCredentialsPreferenceController.java b/src/com/android/settings/security/ResetCredentialsPreferenceController.java index d77fa628604583cfdb320a097d48306acc20d801..46355900d073f0c5a0883d7083c50bf4581a59cc 100644 --- a/src/com/android/settings/security/ResetCredentialsPreferenceController.java +++ b/src/com/android/settings/security/ResetCredentialsPreferenceController.java @@ -19,13 +19,14 @@ 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; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.PreferenceScreen; + public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController implements LifecycleObserver, OnResume { diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java index c0f9dc813ae1159b7dedc7cc1d8e381189a92284..e58159c224035e6cb1c751cc66447ecca10fe26b 100644 --- a/src/com/android/settings/security/ScreenPinningSettings.java +++ b/src/com/android/settings/security/ScreenPinningSettings.java @@ -22,10 +22,6 @@ 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; @@ -45,6 +41,11 @@ import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * Screen pinning settings. */ diff --git a/src/com/android/settings/security/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..03dd9dacaf4ea6c1745b83a8ae2ee93e08e95501 100644 --- a/src/com/android/settings/security/SimLockPreferenceController.java +++ b/src/com/android/settings/security/SimLockPreferenceController.java @@ -19,8 +19,6 @@ 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; @@ -30,6 +28,9 @@ import com.android.settings.core.BasePreferenceController; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class SimLockPreferenceController extends BasePreferenceController { private static final String KEY_SIM_LOCK = "sim_lock_settings"; diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java index c2bd38bcef59090ec35d1059c30a31f8915369c1..e19ab484a7a984e6f9d7b2468864280be2551871 100644 --- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java +++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java @@ -22,7 +22,6 @@ 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; @@ -35,6 +34,8 @@ import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; + public class LockAfterTimeoutPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java index 5f436803c84ec767b81bf686ee6e0d6006947747..9f9066774d55d83d20a0791826f08a4ed98a2a7e 100644 --- a/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java +++ b/src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; + public class PatternVisiblePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java index 6421bd9fe9e302969c3742c46f9b2a2fe0e8bdaa..54a13c2a985f375272b7f717dc0c5d94c3b4a039 100644 --- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java +++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.security.screenlock; import android.app.admin.DevicePolicyManager; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.TwoStatePreference; import android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; @@ -29,6 +27,9 @@ import com.android.settings.overlay.FeatureFactory; import com.android.settings.security.trustagent.TrustAgentManager; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.TwoStatePreference; + public class PowerButtonInstantLockPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java index 3d92bdea47d963c8112cef1b7bc98a04bad777c9..ca3208c4932c89745ed8d1dcf238dd4ee52df45f 100644 --- a/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java +++ b/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.security.trustagent; import android.content.Context; import android.os.UserHandle; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -27,6 +25,9 @@ import com.android.settings.core.BasePreferenceController; import com.android.settings.overlay.FeatureFactory; import com.android.settings.security.SecurityFeatureProvider; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + public class ManageTrustAgentsPreferenceController extends BasePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java index 89d8de7b04457b585a87a22ab9bb0df02a55ff77..ab9099c9663acc077584c4dc081484040cecde21 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java +++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java @@ -23,10 +23,6 @@ import android.content.Context; import android.content.Intent; 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 android.text.TextUtils; import com.android.internal.widget.LockPatternUtils; @@ -46,6 +42,11 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + public class TrustAgentListPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState, OnCreate, OnResume { diff --git a/src/com/android/settings/security/trustagent/TrustAgentManager.java b/src/com/android/settings/security/trustagent/TrustAgentManager.java index 7dcb832b9b4ed79d0c4601322632e47218d22263..acce2d8ca9713530ec4ac592badc1635d254e92a 100644 --- a/src/com/android/settings/security/trustagent/TrustAgentManager.java +++ b/src/com/android/settings/security/trustagent/TrustAgentManager.java @@ -29,7 +29,6 @@ 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; @@ -46,6 +45,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** A manager for trust agent state. */ public class TrustAgentManager { diff --git a/src/com/android/settings/shortcut/CreateShortcut.java b/src/com/android/settings/shortcut/CreateShortcut.java index 78969fed3e2ad1839598a81fb952e499b232c5ef..a25e6247f4d7fe123515d8e819e7fb8726eaba35 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; @@ -49,6 +48,8 @@ import com.android.settings.overlay.FeatureFactory; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + public class CreateShortcut extends LauncherActivity { @VisibleForTesting diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java index ebf34e5ca7c9b43995e50fc652ced7ebd7c4ec51..4cc3c31e92c93ae1f0326064827e12b80733956b 100644 --- a/src/com/android/settings/sim/SimSelectNotification.java +++ b/src/com/android/settings/sim/SimSelectNotification.java @@ -23,8 +23,6 @@ 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; @@ -37,6 +35,8 @@ import com.android.settings.Utils; import java.util.List; +import androidx.core.app.NotificationCompat; + public class SimSelectNotification extends BroadcastReceiver { private static final String TAG = "SimSelectNotification"; private static final int NOTIFICATION_ID = 1; diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java index dd3fc52e3e78707feebc4458b14cbd2c3e64d85d..fa65b07cd3e2f3e32641e9957fbd2922ce2a46aa 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; @@ -47,6 +45,9 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @SearchIndexable public class SimSettings extends RestrictedSettingsFragment implements Indexable { private static final String TAG = "SimSettings"; diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java index 7eda82b902f52a30f30d1520f3e4436bdc3b27e9..9cde91a8558427d72e59d6b769b39f814eea2d5e 100644 --- a/src/com/android/settings/slices/SettingsSliceProvider.java +++ b/src/com/android/settings/slices/SettingsSliceProvider.java @@ -36,8 +36,8 @@ import com.android.settings.bluetooth.BluetoothSliceBuilder; import com.android.settings.core.BasePreferenceController; import com.android.settings.flashlight.FlashlightSliceBuilder; import com.android.settings.location.LocationSliceBuilder; -import com.android.settings.notification.ZenModeSliceBuilder; import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper; +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; diff --git a/src/com/android/settings/slices/SliceBroadcastReceiver.java b/src/com/android/settings/slices/SliceBroadcastReceiver.java index 95f053844e590473633543ddf739b8b82de1f9d7..7d50410731fe71251c4d86488098d4dc03cf8e06 100644 --- a/src/com/android/settings/slices/SliceBroadcastReceiver.java +++ b/src/com/android/settings/slices/SliceBroadcastReceiver.java @@ -17,18 +17,23 @@ package com.android.settings.slices; import static com.android.settings.bluetooth.BluetoothSliceBuilder.ACTION_BLUETOOTH_SLICE_CHANGED; -import static com.android.settings.flashlight.FlashlightSliceBuilder.ACTION_FLASHLIGHT_SLICE_CHANGED; +import static com.android.settings.flashlight.FlashlightSliceBuilder + .ACTION_FLASHLIGHT_SLICE_CHANGED; +import static com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper + .ACTION_ENHANCED_4G_LTE_CHANGED; import static com.android.settings.notification.ZenModeSliceBuilder.ACTION_ZEN_MODE_SLICE_CHANGED; import static com.android.settings.slices.SettingsSliceProvider.ACTION_SLIDER_CHANGED; 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.mobilenetwork.Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED; -import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY; -import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED; -import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED; +import static com.android.settings.wifi.calling.WifiCallingSliceHelper.ACTION_WIFI_CALLING_CHANGED; +import static com.android.settings.wifi.calling.WifiCallingSliceHelper + .ACTION_WIFI_CALLING_PREFERENCE_CELLULAR_PREFERRED; +import static com.android.settings.wifi.calling.WifiCallingSliceHelper + .ACTION_WIFI_CALLING_PREFERENCE_WIFI_ONLY; +import static com.android.settings.wifi.calling.WifiCallingSliceHelper + .ACTION_WIFI_CALLING_PREFERENCE_WIFI_PREFERRED; 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 804721c38103ea339730da99a2d50ec0c1b90880..0aaaca774b9bcd75b508b4e67307633f4bdd7935 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,7 +26,6 @@ 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; @@ -46,16 +41,14 @@ 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.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/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..877c108b323867bfbe476d7becff2f78221901a9 100644 --- a/src/com/android/settings/slices/SlicesDatabaseAccessor.java +++ b/src/com/android/settings/slices/SlicesDatabaseAccessor.java @@ -18,11 +18,10 @@ 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; diff --git a/src/com/android/settings/slices/SlicesDatabaseHelper.java b/src/com/android/settings/slices/SlicesDatabaseHelper.java index d4b71cfbbd21cb6dae5a949a406bcfb71e5d006c..4024235b2346c515b6b051d2c17649d8900ef30a 100644 --- a/src/com/android/settings/slices/SlicesDatabaseHelper.java +++ b/src/com/android/settings/slices/SlicesDatabaseHelper.java @@ -17,15 +17,15 @@ 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 java.util.Locale; +import androidx.annotation.VisibleForTesting; + /** * Defines the schema for the Slices database. */ diff --git a/src/com/android/settings/slices/SlicesIndexer.java b/src/com/android/settings/slices/SlicesIndexer.java index 704d8d6b074be643e1be5f4cc86d12b7af9ea399..a4c27f60338f804afafb11f68857cc66314c6e10 100644 --- a/src/com/android/settings/slices/SlicesIndexer.java +++ b/src/com/android/settings/slices/SlicesIndexer.java @@ -19,18 +19,18 @@ 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 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; import java.util.List; +import androidx.annotation.VisibleForTesting; + /** * Manages the conversion of {@link DashboardFragment} and {@link BasePreferenceController} to * indexable data {@link SliceData} to be stored for Slices. diff --git a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java index fdbf610802c5585946f8f6261d28b7fc9cf4af2e..c93b00d06e9275d6eb5f4f6e5053ee3297417471 100644 --- a/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java +++ b/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceController.java @@ -20,16 +20,16 @@ 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; +import androidx.preference.Preference; + /** * This class allows switching between HFP-connected & HAP-connected BT devices * while in on-call state. diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java index bf9e37f9039acfc28d4135285c49fe89b9b4c658..c2de56dfa212dd06d6cdde6eaddffba7a9aeb06b 100644 --- a/src/com/android/settings/sound/MediaOutputPreferenceController.java +++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java @@ -21,17 +21,17 @@ 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; +import androidx.preference.Preference; + /** * This class which allows switching between A2dp-connected & HAP-connected BT devices. * A few conditions will disable this switcher: diff --git a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java index 1ec566e01bf53d80d76e25e07966cc658bc87b56..e025c6062ebae6b3f8c1981117135ef5d71df4ff 100644 --- a/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java +++ b/src/com/android/settings/support/NewDeviceIntroSuggestionActivity.java @@ -25,8 +25,6 @@ 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; @@ -38,6 +36,9 @@ import com.android.settings.overlay.SupportFeatureProvider; import java.util.List; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; + public class NewDeviceIntroSuggestionActivity extends Activity { private static final String TAG = "NewDeviceIntroSugg"; 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 e4786f5a6b67c06c4475a307f8eb13f1444a2557..52349ae6fa876438c8c0c8c522b5d929063de8b6 100644 --- a/src/com/android/settings/system/SystemDashboardFragment.java +++ b/src/com/android/settings/system/SystemDashboardFragment.java @@ -18,9 +18,6 @@ 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; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -33,6 +30,10 @@ import com.android.settingslib.search.SearchIndexable; import java.util.Arrays; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + @SearchIndexable public class SystemDashboardFragment extends DashboardFragment { diff --git a/src/com/android/settings/system/SystemUpdatePreferenceController.java b/src/com/android/settings/system/SystemUpdatePreferenceController.java index 54ab924a5784843fda64818c9a77aa5362eebbf0..b2de2b37b842839186951c0f9863d33375dd3484 100644 --- a/src/com/android/settings/system/SystemUpdatePreferenceController.java +++ b/src/com/android/settings/system/SystemUpdatePreferenceController.java @@ -25,8 +25,6 @@ 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; @@ -38,6 +36,9 @@ import com.android.settings.core.BasePreferenceController; import java.util.concurrent.ExecutionException; import java.util.concurrent.FutureTask; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class SystemUpdatePreferenceController extends BasePreferenceController { private static final String TAG = "SysUpdatePrefContr"; diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java index 7f56ef962cafa22fdbf2b20f20cc2f805503ce3c..c4f980be261d874f6fce56a2edf3a28f23736315 100644 --- a/src/com/android/settings/tts/TextToSpeechSettings.java +++ b/src/com/android/settings/tts/TextToSpeechSettings.java @@ -31,8 +31,6 @@ 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; @@ -59,6 +57,9 @@ import java.util.MissingResourceException; import java.util.Objects; import java.util.Set; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + @SearchIndexable public class TextToSpeechSettings extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener, diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java index a5cb1fd365558417d845c428583363a01f5f115d..84f5b7e337ad68acab27bbaaf2e0ad03d3375244 100644 --- a/src/com/android/settings/tts/TtsEnginePreference.java +++ b/src/com/android/settings/tts/TtsEnginePreference.java @@ -21,8 +21,6 @@ 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; @@ -31,6 +29,9 @@ import android.widget.RadioButton; import com.android.settings.R; import com.android.settings.SettingsActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class TtsEnginePreference extends Preference { diff --git a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java index 629f1ca3f1501cf486ae2027d3f3c05e1ecc7e7a..42c3c5366bfb2d29f82c93bb49da8d4cee0faf6a 100644 --- a/src/com/android/settings/tts/TtsEnginePreferenceFragment.java +++ b/src/com/android/settings/tts/TtsEnginePreferenceFragment.java @@ -1,27 +1,29 @@ 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 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 com.android.settings.search.Indexable; +import com.android.settings.tts.TtsEnginePreference.RadioButtonGroupState; import com.android.settingslib.search.SearchIndexable; -import android.content.Context; -import android.provider.SearchIndexableResource; - -import java.util.List; import java.util.Arrays; +import java.util.List; + +import androidx.preference.PreferenceCategory; @SearchIndexable public class TtsEnginePreferenceFragment extends SettingsPreferenceFragment //implements diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index db132426711ac922106f4e8d02c61966f1457f78..15e721aefe590c23fbd4c0043662276e123cfbd5 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; @@ -66,6 +58,15 @@ import java.util.List; import java.util.Set; import java.util.StringTokenizer; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + public class AppRestrictionsFragment extends SettingsPreferenceFragment implements OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener, AppRestrictionsHelper.OnDisableUiForPackageListener { diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 42de8921463d2f912340a0bfe2e0b0e48461be0b..c1f0e28638ce832e849c51516255df7cfa1a230e 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -26,8 +26,6 @@ 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 com.android.internal.logging.nano.MetricsProto; @@ -36,6 +34,9 @@ import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class AutoSyncDataPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java index 9368b81353a61067f2a11c0a662fbac178eabff7..d24815eb3c88e5dab6e24cf1444a7c2e0239a2ff 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; @@ -65,6 +64,8 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; +import androidx.core.content.FileProvider; + public class EditUserPhotoController { private static final String TAG = "EditUserPhotoController"; 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/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index d18e2ea5bf333f1567f62865979a620b23fa8774..80f493f2619331ee001194917701ce76b7312ee5 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -23,8 +23,6 @@ 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 com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -34,6 +32,9 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * Settings screen for configuring a specific user. It can contain user restrictions * and deletion controls. It is shown when you tap on the settings icon in the diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java index 391e13a7065e7194593456438180e7bf47a598c8..544dd72f1721a1f30a3d423361de88d565743d94 100644 --- a/src/com/android/settings/users/UserPreference.java +++ b/src/com/android/settings/users/UserPreference.java @@ -20,7 +20,6 @@ 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; @@ -32,6 +31,8 @@ import com.android.settingslib.RestrictedPreference; import java.util.Comparator; +import androidx.preference.PreferenceViewHolder; + public class UserPreference extends RestrictedPreference { private static final int ALPHA_ENABLED = 255; private static final int ALPHA_DISABLED = 102; diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index 71f52f83536d886d459888222a020c857e60840e..83443333d4d7b600284b668316f84610a8a4ec55 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -30,8 +30,6 @@ 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; @@ -46,6 +44,9 @@ import com.android.settingslib.applications.ServiceListing; import java.util.List; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + public abstract class ManagedServiceSettings extends EmptyTextSettings { private static final String TAG = "ManagedServiceSettings"; private final Config mConfig; diff --git a/src/com/android/settings/utils/SettingsDividerItemDecoration.java b/src/com/android/settings/utils/SettingsDividerItemDecoration.java index 32844d5ee711c36719e92ad8f7047c9d58df328d..70b0188b8ad20ae757dc062fa23f787ffb5ed716 100644 --- a/src/com/android/settings/utils/SettingsDividerItemDecoration.java +++ b/src/com/android/settings/utils/SettingsDividerItemDecoration.java @@ -17,11 +17,12 @@ package com.android.settings.utils; import android.content.Context; -import androidx.preference.PreferenceViewHolder; -import androidx.recyclerview.widget.RecyclerView; import com.android.setupwizardlib.DividerItemDecoration; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + public class SettingsDividerItemDecoration extends DividerItemDecoration { public SettingsDividerItemDecoration(Context context) { 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 50c578ffc9b8538a6719d3af9b1f74f78dc6a1b5..f0908fb5bddf06c268b337d502769aff4413e3fd 100644 --- a/src/com/android/settings/vpn2/AppManagementFragment.java +++ b/src/com/android/settings/vpn2/AppManagementFragment.java @@ -34,7 +34,6 @@ 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; @@ -51,6 +50,8 @@ import com.android.settingslib.RestrictedSwitchPreference; import java.util.List; +import androidx.preference.Preference; + public class AppManagementFragment extends SettingsPreferenceFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener, ConfirmLockdownFragment.ConfirmLockdownListener { diff --git a/src/com/android/settings/vpn2/AppPreference.java b/src/com/android/settings/vpn2/AppPreference.java index fc06b1e1129729cc0a0b70a02d11abf3f48bcd0a..e2c26ea61a122f6652976c458674ec4fe11d47f4 100644 --- a/src/com/android/settings/vpn2/AppPreference.java +++ b/src/com/android/settings/vpn2/AppPreference.java @@ -21,11 +21,12 @@ 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; import com.android.internal.net.VpnConfig; +import androidx.preference.Preference; + /** * {@link androidx.preference.Preference} containing information about a VPN * application. Tracks the package name and connection state. diff --git a/src/com/android/settings/vpn2/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..167cdda9d2b847d7a5741e150849edfc2920d518 100644 --- a/src/com/android/settings/vpn2/LegacyVpnPreference.java +++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java @@ -19,13 +19,14 @@ 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 com.android.internal.net.VpnProfile; import com.android.settings.R; +import androidx.preference.Preference; + /** * {@link androidx.preference.Preference} tracks the underlying legacy vpn profile and * its connection state. diff --git a/src/com/android/settings/vpn2/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..4d7c8556231af5808e7b65b398c554707ee04057 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; @@ -71,7 +71,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static android.app.AppOpsManager.OP_ACTIVATE_VPN; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; /** * Settings screen listing VPNs. Configured VPNs and networks managed by apps diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java index 0cc05e061ead9328d1f8b56e27f61e29e7f27c03..8c6286cb0ef248559fab670a1bd93e39173712c4 100644 --- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java +++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java @@ -22,12 +22,13 @@ 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; import com.android.settings.R; import com.android.settings.core.SubSettingLauncher; +import androidx.annotation.VisibleForTesting; + public class WallpaperSuggestionActivity extends Activity { @Override diff --git a/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java b/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java index a9f5a8a341fda29045cbdeb69045bf5fb6594110..0dad196f49370e563faf05386c76e64a0fb0724e 100644 --- a/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java +++ b/src/com/android/settings/wallpaper/WallpaperTypePreferenceController.java @@ -22,8 +22,6 @@ 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; import android.text.TextUtils; import com.android.settings.core.BasePreferenceController; @@ -33,6 +31,9 @@ import com.android.settingslib.core.lifecycle.events.OnStart; import java.util.List; import java.util.stream.Collectors; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class WallpaperTypePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart { private Fragment mParentFragment; diff --git a/src/com/android/settings/webview/WebViewAppPicker.java b/src/com/android/settings/webview/WebViewAppPicker.java index ecb486dae9fe0b836994d72dafc24a999e9e3bef..1dd80fb6e69d8a1221db4f0d44156003abd9d2c6 100644 --- a/src/com/android/settings/webview/WebViewAppPicker.java +++ b/src/com/android/settings/webview/WebViewAppPicker.java @@ -25,7 +25,6 @@ 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; @@ -37,6 +36,8 @@ import com.android.settingslib.applications.DefaultAppInfo; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; + public class WebViewAppPicker extends DefaultAppPickerFragment { private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper; diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 156f2afbedf444f606b77bacb6bf24d32ce3c483..3d8dbdea986b32028536784fc1a3479ccdff8d01 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; @@ -71,6 +63,15 @@ import com.android.settingslib.search.SearchIndexable; import java.util.ArrayList; import java.util.List; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + /** * The Settings screen for WifiDisplay configuration and connection management. * diff --git a/src/com/android/settings/widget/ActionBarShadowController.java b/src/com/android/settings/widget/ActionBarShadowController.java index cb5e38dcb62ab9d147668d41bb050202697203ec..7e2e91ad23c00a10aa0132e9612e825c03fa6ce9 100644 --- a/src/com/android/settings/widget/ActionBarShadowController.java +++ b/src/com/android/settings/widget/ActionBarShadowController.java @@ -18,8 +18,6 @@ package com.android.settings.widget; import android.app.ActionBar; import android.app.Activity; -import androidx.annotation.VisibleForTesting; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -27,6 +25,9 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + /** * A controller that adds shadow to actionbar when content view scrolls. *

diff --git a/src/com/android/settings/widget/ActionButtonPreference.java b/src/com/android/settings/widget/ActionButtonPreference.java index 64a01c7e178f6ec47581bb1da73bded06ea82669..7f8bd4e0c2e970dd20bdf8cec377c4e74937affa 100644 --- a/src/com/android/settings/widget/ActionButtonPreference.java +++ b/src/com/android/settings/widget/ActionButtonPreference.java @@ -17,9 +17,6 @@ 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; @@ -27,6 +24,10 @@ import android.widget.Button; import com.android.settings.R; +import androidx.annotation.StringRes; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class ActionButtonPreference extends Preference { private final ButtonInfo mButton1Info = new ButtonInfo(); diff --git a/src/com/android/settings/widget/AppCheckBoxPreference.java b/src/com/android/settings/widget/AppCheckBoxPreference.java index 23ee894b8d90ee9fc576709ca31f1e4a952cde09..a0d95e94c39e5fd74aff663893fffef1b427b33d 100644 --- a/src/com/android/settings/widget/AppCheckBoxPreference.java +++ b/src/com/android/settings/widget/AppCheckBoxPreference.java @@ -17,11 +17,12 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.CheckBoxPreference; import android.util.AttributeSet; import com.android.settings.R; +import androidx.preference.CheckBoxPreference; + /** * {@link CheckBoxPreference} that used only to display app */ diff --git a/src/com/android/settings/widget/AppPreference.java b/src/com/android/settings/widget/AppPreference.java index 3b716a31b901f260beb43995a85cfa650f3f6886..77ff0cc9fa47c5635d74950f6dedd5eb36579ced 100644 --- a/src/com/android/settings/widget/AppPreference.java +++ b/src/com/android/settings/widget/AppPreference.java @@ -16,8 +16,6 @@ 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; @@ -25,6 +23,9 @@ import android.widget.ProgressBar; import com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class AppPreference extends Preference { private int mProgress; diff --git a/src/com/android/settings/widget/AppSwitchPreference.java b/src/com/android/settings/widget/AppSwitchPreference.java index b42bb3db253b51ab4dbd60e626ccf4fc11c8b4c7..12aef6dafd3ff269df53f619fc0c42826ee5703d 100644 --- a/src/com/android/settings/widget/AppSwitchPreference.java +++ b/src/com/android/settings/widget/AppSwitchPreference.java @@ -17,13 +17,14 @@ 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 com.android.settings.R; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + public class AppSwitchPreference extends SwitchPreference { public AppSwitchPreference(Context context) { diff --git a/src/com/android/settings/widget/AspectRatioFrameLayout.java b/src/com/android/settings/widget/AspectRatioFrameLayout.java index 5eab257ffaa71c0b8df40b0a306c4976f43db5ca..066c94a517f1daa0c5c62e8a245b6833965b6da4 100644 --- a/src/com/android/settings/widget/AspectRatioFrameLayout.java +++ b/src/com/android/settings/widget/AspectRatioFrameLayout.java @@ -16,12 +16,13 @@ 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 com.android.settings.R; +import androidx.annotation.VisibleForTesting; + /** * A {@link FrameLayout} with customizable aspect ratio. * This is used to avoid dynamically calculating the height for the frame. Default aspect diff --git a/src/com/android/settings/widget/BottomLabelLayout.java b/src/com/android/settings/widget/BottomLabelLayout.java index dca528f94c0b8364cc57feff1102c195fb5ed289..b72be363c1748dd58eeefc562bae06b2abbbb1e1 100644 --- a/src/com/android/settings/widget/BottomLabelLayout.java +++ b/src/com/android/settings/widget/BottomLabelLayout.java @@ -18,7 +18,6 @@ package com.android.settings.widget; import android.annotation.Nullable; import android.content.Context; -import androidx.annotation.VisibleForTesting; import android.util.AttributeSet; import android.view.Gravity; import android.view.View; @@ -26,6 +25,8 @@ import android.widget.LinearLayout; import com.android.settingslib.R; +import androidx.annotation.VisibleForTesting; + /** * An extension of LinearLayout that automatically switches to vertical * orientation when it can't fit its child views horizontally. diff --git a/src/com/android/settings/widget/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 0acb81ca5769c5b3de9e3c9a5cbfe78fc97a4ed6..0489d6a8262005d7e74bb7ea020ec8f8a3ed6025 100644 --- a/src/com/android/settings/widget/DonutView.java +++ b/src/com/android/settings/widget/DonutView.java @@ -36,14 +36,14 @@ import android.text.style.RelativeSizeSpan; import android.util.AttributeSet; import android.view.View; -import androidx.annotation.ColorRes; - import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; import com.android.settings.Utils; import java.util.Locale; +import androidx.annotation.ColorRes; + /** * DonutView represents a donut graph. It visualizes a certain percentage of fullness with a * corresponding label with the fullness on the inside (i.e. "50%" inside of the donut). diff --git a/src/com/android/settings/widget/DotsPageIndicator.java b/src/com/android/settings/widget/DotsPageIndicator.java index 096338bbbf00491f01c65e44fc00461aab25c8d2..633658e605027d71f2e26bc6d5b34c98eb1bc8fb 100644 --- a/src/com/android/settings/widget/DotsPageIndicator.java +++ b/src/com/android/settings/widget/DotsPageIndicator.java @@ -30,14 +30,16 @@ 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 com.android.settings.R; import java.util.Arrays; +import androidx.viewpager.widget.ViewPager; + /** * Custom pager indicator for use with a {@code ViewPager}. */ diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 3e724fa44b2057585d64b8b259c0766e70d17cb0..9b2edff4fb65fb330f337d55fa9dac4218f7cee2 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -31,11 +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; @@ -57,6 +52,10 @@ import com.android.settingslib.core.lifecycle.Lifecycle; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import androidx.annotation.IntDef; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; + public class EntityHeaderController { @IntDef({ActionType.ACTION_NONE, diff --git a/src/com/android/settings/widget/FixedLineSummaryPreference.java b/src/com/android/settings/widget/FixedLineSummaryPreference.java index 7187c7b6ee518b580194a42747396bfe931b6d3a..d7d832958bf884a37201c9353938499ab75848d3 100644 --- a/src/com/android/settings/widget/FixedLineSummaryPreference.java +++ b/src/com/android/settings/widget/FixedLineSummaryPreference.java @@ -16,13 +16,15 @@ 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 com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A preference whose summary text will only span one single line. */ diff --git a/src/com/android/settings/widget/GearPreference.java b/src/com/android/settings/widget/GearPreference.java index 200156b1cdbeacc3f3fa16b7b511e1ab4f765a7a..c473d41cc2cb1374df19655cbe88b460f1ba14b7 100644 --- a/src/com/android/settings/widget/GearPreference.java +++ b/src/com/android/settings/widget/GearPreference.java @@ -17,13 +17,14 @@ package com.android.settings.widget; import android.content.Context; -import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import com.android.settings.R; import com.android.settingslib.RestrictedPreference; +import androidx.preference.PreferenceViewHolder; + /** * A preference with a Gear on the side */ diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java index 3a5548ea7a3aa988a28a6d721fe619f4bc2f05da..0292db9d5e16fefabf1fb31d872970b67d74a7a3 100644 --- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java +++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java @@ -25,12 +25,6 @@ import android.animation.ValueAnimator; import android.content.Context; import android.graphics.Color; import android.os.Bundle; -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; @@ -39,6 +33,13 @@ import android.view.View; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceGroupAdapter; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + public class HighlightablePreferenceGroupAdapter extends PreferenceGroupAdapter { private static final String TAG = "HighlightableAdapter"; diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java index 7725283e0c4392f5872cd0b48317d4ef67652faf..904a98c03be9a8ad5da0231c46f28eafabd466fd 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; @@ -33,6 +29,10 @@ import android.widget.SeekBar; import java.util.List; +import androidx.core.view.ViewCompat; +import androidx.core.view.accessibility.AccessibilityNodeInfoCompat; +import androidx.customview.widget.ExploreByTouchHelper; + /** * LabeledSeekBar represent a seek bar assigned with labeled, discrete values. * It pretends to be a group of radio button for AccessibilityServices, in order to adjust the diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java index 8fe59e8b9a9b9d9994c6c338ef8ecbbe746b5a80..0e3d8f9f233ee96bc25c3a77e7f79abc8adbf16c 100644 --- a/src/com/android/settings/widget/MasterCheckBoxPreference.java +++ b/src/com/android/settings/widget/MasterCheckBoxPreference.java @@ -17,7 +17,6 @@ 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; @@ -26,6 +25,8 @@ import android.widget.CheckBox; import com.android.settings.R; import com.android.settingslib.TwoTargetPreference; +import androidx.preference.PreferenceViewHolder; + /** * A custom preference that provides inline checkbox. It has a mandatory field for title, and * optional fields for icon and sub-text. diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java index 1244d33651537ad0847ccb6a1ccbf929adb7edc2..a00929259f70ba1f71a5ea4e9e8f4a85a5197baa 100644 --- a/src/com/android/settings/widget/MasterSwitchController.java +++ b/src/com/android/settings/widget/MasterSwitchController.java @@ -16,10 +16,10 @@ package com.android.settings.widget; -import androidx.preference.Preference; -import android.widget.Switch; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; +import androidx.preference.Preference; + /* * The switch controller that is used to update the switch widget in the MasterSwitchPreference * layout. diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java index 765eae1293abedf18f5cf3a49cf577bc22921e2e..d4197db6bb806177893dff4aba374c955f5d28e1 100644 --- a/src/com/android/settings/widget/MasterSwitchPreference.java +++ b/src/com/android/settings/widget/MasterSwitchPreference.java @@ -17,7 +17,6 @@ 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; @@ -27,6 +26,8 @@ import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.TwoTargetPreference; +import androidx.preference.PreferenceViewHolder; + /** * A custom preference that provides inline switch toggle. It has a mandatory field for title, and * optional fields for icon and sub-text. diff --git a/src/com/android/settings/widget/RadioButtonPickerFragment.java b/src/com/android/settings/widget/RadioButtonPickerFragment.java index 8142d0bc7163f09e448e05c2d7acd7175c9f61a2..7735bb421ee751d99cbecd6abaeb469830f57b1d 100644 --- a/src/com/android/settings/widget/RadioButtonPickerFragment.java +++ b/src/com/android/settings/widget/RadioButtonPickerFragment.java @@ -20,10 +20,6 @@ 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; @@ -38,6 +34,11 @@ import com.android.settingslib.widget.CandidateInfo; import java.util.List; import java.util.Map; +import androidx.annotation.LayoutRes; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class RadioButtonPickerFragment extends InstrumentedPreferenceFragment implements RadioButtonPreference.OnClickListener { diff --git a/src/com/android/settings/widget/RadioButtonPreference.java b/src/com/android/settings/widget/RadioButtonPreference.java index 9b5c17007088362cf96d49fcf4f56bd3b8aacc55..8ebbb8af9a5b60c8e4dc55309a156600bafbe820 100644 --- a/src/com/android/settings/widget/RadioButtonPreference.java +++ b/src/com/android/settings/widget/RadioButtonPreference.java @@ -17,9 +17,6 @@ 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; @@ -27,6 +24,10 @@ import android.widget.TextView; import com.android.settings.R; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceViewHolder; + /** * Check box preference with check box replaced by radio button. * diff --git a/src/com/android/settings/widget/RestrictedAppPreference.java b/src/com/android/settings/widget/RestrictedAppPreference.java index 9518c693e30d05c5f10aefe1b54e536e345f4891..72625e0873ca1ca4aecf20aafe166be4f94b0d23 100644 --- a/src/com/android/settings/widget/RestrictedAppPreference.java +++ b/src/com/android/settings/widget/RestrictedAppPreference.java @@ -18,8 +18,6 @@ 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; @@ -28,6 +26,9 @@ import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreferenceHelper; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceViewHolder; + /** * {@link AppPreference} that implements user restriction utilities using * {@link com.android.settingslib.RestrictedPreferenceHelper}. diff --git a/src/com/android/settings/widget/RtlCompatibleViewPager.java b/src/com/android/settings/widget/RtlCompatibleViewPager.java index ac28e7bf4cb1ce974a156d12575b535844ea6853..be405864ac6ddcd93882dfaa66fd62800ab49ca5 100644 --- a/src/com/android/settings/widget/RtlCompatibleViewPager.java +++ b/src/com/android/settings/widget/RtlCompatibleViewPager.java @@ -17,15 +17,16 @@ 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 java.util.Locale; +import androidx.viewpager.widget.ViewPager; + /** * A {@link ViewPager} that's aware of RTL changes when used with FragmentPagerAdapter. */ 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..da251fa7bfd9beb866dfe5aeae96edd4f79df34a 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,9 +28,11 @@ import android.view.accessibility.AccessibilityNodeInfo; import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.android.settings.widget.DefaultIndicatorSeekBar; import com.android.settingslib.RestrictedPreference; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.PreferenceViewHolder; + /** * Based on android.preference.SeekBarPreference, but uses support preference as base. */ 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..f8adde8d2f3edded937746e1d2aed96ac9291346 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; @@ -28,6 +27,8 @@ import android.widget.TextView; import com.android.settings.R; +import androidx.viewpager.widget.PagerAdapter; + /** * To be used with ViewPager to provide a tab indicator component which give constant feedback as * to the user's scroll progress. diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java index 857075bfb5a17f556508fd3178cc467f96168782..3450648ecc579657b960b57144c616c761b7697b 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; @@ -47,6 +44,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.ArrayList; import java.util.List; +import androidx.annotation.ColorInt; +import androidx.annotation.StringRes; +import androidx.annotation.VisibleForTesting; + public class SwitchBar extends LinearLayout implements CompoundButton.OnCheckedChangeListener { public interface OnSwitchChangeListener { diff --git a/src/com/android/settings/widget/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/UpdatableListPreferenceDialogFragment.java b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java index 1434694f74cb18eac311de023ca81d611eea6561..5877078f8e68d1bd2ee728fd94fb122250931284 100644 --- a/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java +++ b/src/com/android/settings/widget/UpdatableListPreferenceDialogFragment.java @@ -19,13 +19,15 @@ import android.app.AlertDialog; import android.content.res.TypedArray; import android.os.Bundle; import android.widget.ArrayAdapter; -import androidx.annotation.VisibleForTesting; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceDialogFragment; + import com.android.settingslib.core.instrumentation.Instrumentable; import java.util.ArrayList; +import androidx.annotation.VisibleForTesting; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceDialogFragment; + /** * {@link PreferenceDialogFragment} that updates the available options * when {@code onListPreferenceUpdated} is called." diff --git a/src/com/android/settings/widget/UsageGraph.java b/src/com/android/settings/widget/UsageGraph.java index 7238e5de1288a9debab8a8a2fcf5042a24108417..e56fd4354884af4d0167f1469bfa7e233ba3dbfc 100644 --- a/src/com/android/settings/widget/UsageGraph.java +++ b/src/com/android/settings/widget/UsageGraph.java @@ -30,7 +30,6 @@ 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; @@ -39,6 +38,8 @@ import android.view.View; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.R; +import androidx.annotation.VisibleForTesting; + public class UsageGraph extends View { private static final int PATH_DELIM = -1; diff --git a/src/com/android/settings/widget/ValidatedEditTextPreference.java b/src/com/android/settings/widget/ValidatedEditTextPreference.java index 8ffffb7f6565c3aaf38e044acbf2946c0e444579..35be5023be5b868f7e8710cbc0c13ddda93b14b6 100644 --- a/src/com/android/settings/widget/ValidatedEditTextPreference.java +++ b/src/com/android/settings/widget/ValidatedEditTextPreference.java @@ -18,20 +18,20 @@ 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 com.android.settingslib.CustomEditTextPreference; +import androidx.annotation.VisibleForTesting; +import androidx.preference.PreferenceViewHolder; + /** * {@code EditTextPreference} that supports input validation. */ diff --git a/src/com/android/settings/widget/VideoPreference.java b/src/com/android/settings/widget/VideoPreference.java index 4ec98296e1bb0cb545be5de7967c98bdf00b9ea3..fcbad465f979fbfe2e23cfe050b54429a778f561 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; @@ -34,6 +31,10 @@ import android.widget.ImageView; import com.android.settings.R; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A full width preference that hosts a MP4 video. */ diff --git a/src/com/android/settings/widget/WorkOnlyCategory.java b/src/com/android/settings/widget/WorkOnlyCategory.java index 449916b6cfe237995a03ad5bfea5dbb90af09a5a..87d0684da941da4bf815fceab4334d4f10cccc21 100644 --- a/src/com/android/settings/widget/WorkOnlyCategory.java +++ b/src/com/android/settings/widget/WorkOnlyCategory.java @@ -16,12 +16,13 @@ package com.android.settings.widget; import android.content.Context; import android.os.UserManager; -import androidx.preference.PreferenceCategory; import android.util.AttributeSet; import com.android.settings.SelfAvailablePreference; import com.android.settings.Utils; +import androidx.preference.PreferenceCategory; + /** * A PreferenceCategory that is only visible when the device has a work profile. */ diff --git a/src/com/android/settings/wifi/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..aed5e10cda750645de9c32afa00946c7dea2c8ee 100644 --- a/src/com/android/settings/wifi/CellularFallbackPreferenceController.java +++ b/src/com/android/settings/wifi/CellularFallbackPreferenceController.java @@ -18,13 +18,14 @@ 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 com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + /** * {@link AbstractPreferenceController} that controls whether we should fall back to celluar when * wifi is bad. diff --git a/src/com/android/settings/wifi/ChangeWifiStateDetails.java b/src/com/android/settings/wifi/ChangeWifiStateDetails.java index 1c59ddd02b7090e1bdd9ad016238ab0002b1a94f..fbf0d6360c3ca5dcdc47ce7a44729917cf50b5c0 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 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; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.SwitchPreference; public class ChangeWifiStateDetails extends AppInfoWithHeader implements OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java index 1e3723e3570ae067281b4b3ddc5626af1b28b3dc..bbb76c784b8c9bf566755f9aa3bc6066dd1fe163 100644 --- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java +++ b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java @@ -17,14 +17,15 @@ package com.android.settings.wifi; import android.content.Context; -import androidx.annotation.DrawableRes; -import androidx.preference.PreferenceViewHolder; import android.view.View; import com.android.settings.R; import com.android.settingslib.wifi.AccessPoint; import com.android.settingslib.wifi.AccessPointPreference; +import androidx.annotation.DrawableRes; +import androidx.preference.PreferenceViewHolder; + /** * An AP preference for the currently connected AP */ diff --git a/src/com/android/settings/wifi/LinkablePreference.java b/src/com/android/settings/wifi/LinkablePreference.java index e4cb95bcebd99eb7e6c5c6988d33e554ab203b4e..9c00ee2218f31dc9784eb0410a7d20379fe591cf 100644 --- a/src/com/android/settings/wifi/LinkablePreference.java +++ b/src/com/android/settings/wifi/LinkablePreference.java @@ -17,16 +17,18 @@ 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 com.android.settings.LinkifyUtils; +import androidx.annotation.Nullable; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A preference with a title that can have linkable content on click. */ diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java index 213589b9de47111ae69f714a141b821d40c87665..790e5701713200b7f4efbbb8b4d5541c64199273 100644 --- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java +++ b/src/com/android/settings/wifi/LongPressAccessPointPreference.java @@ -17,12 +17,12 @@ package com.android.settings.wifi; import android.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; +import androidx.preference.PreferenceViewHolder; + public class LongPressAccessPointPreference extends AccessPointPreference { private final Fragment mFragment; diff --git a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java index baf273c21db512dc66d8aeec8daf9666e0d9df23..e5f2912fa0f434cd4ea5e85bf8c0ddd0e46112bb 100644 --- a/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java +++ b/src/com/android/settings/wifi/NotifyOpenNetworksPreferenceController.java @@ -22,9 +22,6 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; @@ -34,6 +31,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * {@link AbstractPreferenceController} that controls whether we should notify user when open * network is available. diff --git a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java index 6a716022a5ddbcbc36007fe2e6acf4baf15361d6..a99697a5971d62a449de537b7503047e82bbee54 100644 --- a/src/com/android/settings/wifi/RequestToggleWiFiActivity.java +++ b/src/com/android/settings/wifi/RequestToggleWiFiActivity.java @@ -27,13 +27,15 @@ import android.content.pm.PackageItemInfo; 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 com.android.internal.app.AlertActivity; import com.android.settings.R; +import androidx.annotation.NonNull; + /** * This activity handles requests to toggle WiFi by collecting user * consent and waiting until the state change is completed. diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java index 25c97b203e011381bbec6fa5a7981c17c91e638c..ebb493c2844bd68b498e652549958f7070489f1e 100644 --- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java +++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java @@ -24,9 +24,6 @@ import android.icu.text.Collator; import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.Handler; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.Log; import android.widget.Toast; @@ -43,6 +40,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * UI to manage saved networks/access points. * TODO(b/64806699): convert to {@link DashboardFragment} with {@link PreferenceController}s diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index 6bc2d98f796fadff07bc2e7a7b53fe545949d344..0b397db5eef66e89782b1f1810539c02b6a00e28 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java @@ -13,10 +13,6 @@ 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 androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; @@ -29,6 +25,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * {@link AbstractPreferenceController} that controls whether a user wants to enable the "use open * networks automatically" feature provider by the current network recommendation provider. diff --git a/src/com/android/settings/wifi/WifiAPITest.java b/src/com/android/settings/wifi/WifiAPITest.java index 35f700de815623f8a65aca1c25e55e2c0e4d8ced..9fc5ec4e0919c25573e41a947a7485403479dfda 100644 --- a/src/com/android/settings/wifi/WifiAPITest.java +++ b/src/com/android/settings/wifi/WifiAPITest.java @@ -22,8 +22,6 @@ 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; @@ -31,6 +29,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * Provide an interface for testing out the Wifi API diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 22de20c445c9e4c5d372ffcd05565ecab5eabec0..789c433d9b99b03e701795b5b86fa3eeb1e47b25 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; @@ -71,6 +69,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; +import androidx.annotation.VisibleForTesting; + /** * The class for allowing UIs like {@link WifiDialog} and {@link WifiConfigUiBase} to * share the logic for controlling buttons, text fields, etc. diff --git a/src/com/android/settings/wifi/WifiDetailPreference.java b/src/com/android/settings/wifi/WifiDetailPreference.java index f7ddac7c6fc2786e9d04c53ab2a080a2ae4c4613..449522a8bea877cc4d289fb420f78f107b10866b 100644 --- a/src/com/android/settings/wifi/WifiDetailPreference.java +++ b/src/com/android/settings/wifi/WifiDetailPreference.java @@ -17,14 +17,15 @@ 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 com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + /** * A Preference to be used with the Wifi Network Detail Fragment that allows a summary text to be * set inside the widget resource diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java index 02ce0e4d4e8971dc45065a69ff40b1b56d7a6899..e5526c9a7ca4c9e5c1caccf96cff7167400f0d83 100644 --- a/src/com/android/settings/wifi/WifiDialogActivity.java +++ b/src/com/android/settings/wifi/WifiDialogActivity.java @@ -24,13 +24,14 @@ 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 com.android.settings.SetupWizardUtils; import com.android.settingslib.wifi.AccessPoint; import com.android.setupwizardlib.util.WizardManagerHelper; +import androidx.annotation.VisibleForTesting; + public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener, DialogInterface.OnDismissListener { diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java index 018119b3e579a02deb28c02afd11cdcc8f440ffb..b7696657c19b4dd141110f05c12f4f5570a16de7 100644 --- a/src/com/android/settings/wifi/WifiEnabler.java +++ b/src/com/android/settings/wifi/WifiEnabler.java @@ -28,7 +28,6 @@ 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 com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -41,6 +40,8 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import java.util.concurrent.atomic.AtomicBoolean; +import androidx.annotation.VisibleForTesting; + public class WifiEnabler implements SwitchWidgetController.OnSwitchChangeListener { private final SwitchWidgetController mSwitchWidget; diff --git a/src/com/android/settings/wifi/WifiInfoPreferenceController.java b/src/com/android/settings/wifi/WifiInfoPreferenceController.java index ec17b08d121aa3a8403f1ef8ab9702b138a981e6..445d6a4c9831cb9a0d267d0eb5a3c9776d4b2bae 100644 --- a/src/com/android/settings/wifi/WifiInfoPreferenceController.java +++ b/src/com/android/settings/wifi/WifiInfoPreferenceController.java @@ -23,9 +23,6 @@ import android.content.IntentFilter; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.provider.Settings; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; @@ -37,6 +34,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * {@link PreferenceControllerMixin} that updates MAC/IP address. */ diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java index cbbe8ba2c0175db4f213ba5fb13f782c7ce1ba7a..6f827620bf73b301bbe76f4a6d553e207a29c7c3 100644 --- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java +++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java @@ -16,13 +16,12 @@ 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; @@ -31,6 +30,8 @@ import com.android.settingslib.core.lifecycle.events.OnResume; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.preference.PreferenceScreen; + public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener, LifecycleObserver, OnResume, OnPause, OnStart, OnStop { diff --git a/src/com/android/settings/wifi/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..ccac31e0457b051ed8cbe459368c7ee0df79b7f9 100644 --- a/src/com/android/settings/wifi/WifiPickerActivity.java +++ b/src/com/android/settings/wifi/WifiPickerActivity.java @@ -16,13 +16,14 @@ package com.android.settings.wifi; import android.content.Intent; -import androidx.preference.PreferenceFragment; import com.android.settings.ButtonBarHandler; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.wifi.p2p.WifiP2pSettings; +import androidx.preference.PreferenceFragment; + public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler { @Override diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index 9db766cb3be1bd7754d445414af0770537825838..77636aece91b2664490d169613e14312ce421e8a 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -25,7 +25,6 @@ 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; @@ -35,6 +34,8 @@ import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.HelpUtils; +import androidx.annotation.VisibleForTesting; + public class WifiScanningRequiredFragment extends InstrumentedDialogFragment implements DialogInterface.OnClickListener { diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index 98499ec61ec2bd74ff326b0e86812668c1217197..5397eae685159bd98c6843dece8a756b3b3e828b 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; @@ -75,6 +72,10 @@ import com.android.settingslib.wifi.WifiTrackerFactory; import java.util.ArrayList; import java.util.List; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + /** * Two types of UI are provided here. * diff --git a/src/com/android/settings/wifi/WifiSliceBuilder.java b/src/com/android/settings/wifi/WifiSliceBuilder.java index 6cc071493132a8d7a9f5db8fd42be7f898e1e911..f235e24ecb9be897c73d07626b35e874a72de823 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,7 @@ import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.net.wifi.WifiSsid; import android.provider.SettingsSlicesContract; +import android.text.TextUtils; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -45,8 +44,6 @@ import androidx.slice.Slice; import androidx.slice.builders.ListBuilder; import androidx.slice.builders.SliceAction; -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 16031a50dea2820193873eebf272559bb6dacc60..7ecc432231d0cea18f0054a365ec5c808663e49a 100644 --- a/src/com/android/settings/wifi/WifiSummaryUpdater.java +++ b/src/com/android/settings/wifi/WifiSummaryUpdater.java @@ -24,13 +24,14 @@ 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 com.android.settings.R; import com.android.settings.widget.SummaryUpdater; import com.android.settingslib.wifi.WifiStatusTracker; +import androidx.annotation.VisibleForTesting; + /** * Helper class that listeners to wifi callback and notify client when there is update in * wifi summary info. diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index 0c088257abb8a5cabab191e451eef9040409ed6a..4e35092c5bcf0ef5e348bc0ba4744154f5908d52 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -24,10 +24,6 @@ import android.content.Context; import android.content.Intent; import android.location.LocationManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; @@ -36,6 +32,11 @@ import com.android.settings.dashboard.DashboardFragment; import com.android.settings.utils.AnnotationSpan; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + /** * {@link PreferenceControllerMixin} that controls whether the Wi-Fi Wakeup feature should be * enabled. diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettings.java b/src/com/android/settings/wifi/calling/WifiCallingSettings.java index a9c0ee9f54cae5153700a83347fd6a33c33460b5..0a16eaacbfd90173cead3a89382f7b2abc1be583 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; @@ -39,6 +38,8 @@ import com.android.settings.widget.SlidingTabLayout; import java.util.List; +import androidx.legacy.app.FragmentPagerAdapter; + /** * "Wi-Fi Calling settings" screen. This is the container fragment which holds * {@link WifiCallingSettingsForSub} fragments. diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java index 15137cc821a4fb90ffcbdbfa899f1c4986c626d2..ae14da598bda7ac7e57daa383aba1188f8ab8bde 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; @@ -51,6 +47,11 @@ import com.android.settings.SettingsPreferenceFragment; import com.android.settings.Utils; import com.android.settings.widget.SwitchBar; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceScreen; + /** * This is the inner class of {@link WifiCallingSettings} fragment. * The preference screen lets you enable/disable Wi-Fi Calling and change Wi-Fi Calling mode. diff --git a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java index ab8db2b7728f6a8de02e5bbe39eb3bf38937f9c5..b8cdf28b8d672cb9adb312592a1e682215776f8c 100644 --- a/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java +++ b/src/com/android/settings/wifi/calling/WifiCallingSliceHelper.java @@ -28,16 +28,9 @@ import android.os.PersistableBundle; import android.provider.Settings; 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.ListBuilder.RowBuilder; -import androidx.slice.builders.SliceAction; - import com.android.ims.ImsConfig; import com.android.ims.ImsManager; import com.android.internal.annotations.VisibleForTesting; @@ -55,6 +48,12 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import androidx.core.graphics.drawable.IconCompat; +import androidx.slice.Slice; +import androidx.slice.builders.ListBuilder; +import androidx.slice.builders.ListBuilder.RowBuilder; +import androidx.slice.builders.SliceAction; + /** * Helper class to control slices for wifi calling settings. diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java index d3ea7471a006ee5895e0c37a5dfcf720c7299b78..e5dae7a1151462be4e0cceb4e25baff57a27cf02 100644 --- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java @@ -40,10 +40,6 @@ 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; @@ -76,6 +72,11 @@ import java.net.UnknownHostException; import java.util.StringJoiner; import java.util.stream.Collectors; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** * Controller for logic pertaining to displaying Wifi information for the * {@link WifiNetworkDetailsFragment}. diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java index 097a49be3edbb776e65d11a73d5dea2a699a8957..6558019d3e66f1fbaf5638b08682ffe91f0211ae 100644 --- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java +++ b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java @@ -20,18 +20,14 @@ 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; +import androidx.annotation.VisibleForTesting; +import androidx.preference.DropDownPreference; +import androidx.preference.Preference; + /** * {@link AbstractPreferenceController} that controls whether the wifi network is metered or not */ diff --git a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java index fed363d9dc7a635cbb067e5f72e9f07e7fbf148e..48e4124ce719469c7448ca80f2405136efabcd93 100644 --- a/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceController.java @@ -17,13 +17,14 @@ package com.android.settings.wifi.p2p; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + public abstract class P2pCategoryPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java index 84ce1ee04c656b19e7f3fcdef08cee09086d9c2f..3a2b9f5ecd66d4c1262ce98fe1969570a6b20549 100644 --- a/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java +++ b/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceController.java @@ -18,13 +18,14 @@ package com.android.settings.wifi.p2p; import android.content.Context; import android.net.wifi.p2p.WifiP2pDevice; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class P2pThisDevicePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java index 5a087e527aac9cb173b88d59da753e9b79ab1330..d2d65c3135fb61d53243ea4fe77e5d86a4525c5a 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPeer.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPeer.java @@ -19,12 +19,14 @@ 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 com.android.settings.R; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + public class WifiP2pPeer extends Preference { private static final int[] STATE_SECURED = {R.attr.state_encrypted}; 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..3a7b670625a4a37f9e9beb451518a37fcfd4c5e8 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -20,9 +20,6 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -31,6 +28,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnPause; import com.android.settingslib.core.lifecycle.events.OnResume; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /** * {@link PreferenceControllerMixin} to toggle Wifi Direct preference on Wi-Fi state. */ diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index a849ff73e0c1220eb2c5d995736947427690811d..7ab43c7a4208aa8e4fad13492bfa1b32311b0eb6 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; @@ -57,6 +55,9 @@ import com.android.settingslib.core.AbstractPreferenceController; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + /* * Displays Wi-fi p2p settings UI */ diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index b1f171be3d5a3d4ec70c038740c1be4057c1af0e..cd5eea4007ed10d47b73a3d9e2b1c4dc8a84eb4c 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -19,13 +19,13 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.content.res.Resources; import android.net.wifi.WifiConfiguration; +import android.util.Log; + +import com.android.settings.R; import androidx.annotation.VisibleForTesting; import androidx.preference.ListPreference; import androidx.preference.Preference; -import android.util.Log; - -import com.android.settings.R; public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController { diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index d8c3cfd8a34464f8daade4b8ed491c2d5f103205..d0c2270ad390d05565b236c261da00024da40f0f 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -18,11 +18,12 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + public class WifiTetherAutoOffPreferenceController extends BasePreferenceController implements Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java index e689916475d13425ea2dd1f08c762b9f85bce7e2..59fd989188c875663337e4643274241346e60e71 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherBasePreferenceController.java @@ -19,12 +19,13 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public abstract class WifiTetherBasePreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java index 465170a2c4675653806f2d079be5a6d111cc11c6..bbba316142fb1de7f8eb31982e242fd23b7e9ef5 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java @@ -18,8 +18,6 @@ package com.android.settings.wifi.tether; import android.content.Context; import android.net.wifi.WifiConfiguration; -import androidx.preference.EditTextPreference; -import androidx.preference.Preference; import android.text.TextUtils; import com.android.settings.R; @@ -28,6 +26,9 @@ import com.android.settings.wifi.WifiUtils; import java.util.UUID; +import androidx.preference.EditTextPreference; +import androidx.preference.Preference; + public class WifiTetherPasswordPreferenceController extends WifiTetherBasePreferenceController implements ValidatedEditTextPreference.Validator { diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 3e0297e741b674b11f2fa6f72de62e4138b9cbf4..a8b2dbf7c7072cd0438499a8d6196b05fab1e525 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -24,9 +24,6 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; import android.provider.Settings; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import com.android.settings.R; @@ -38,6 +35,10 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + public class WifiTetherPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceController.java index 176573f584615792e90b49fd3a72eaf991b25035..5044281f36dd1339788a4374a3dbf5a4c6b405b2 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 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; + +import androidx.annotation.VisibleForTesting; +import androidx.preference.EditTextPreference; +import androidx.preference.Preference; 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..055ce9604ef62e09e8201a26bf11565bad7218fb 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceController.java @@ -1,13 +1,13 @@ 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; import com.android.settings.R; +import androidx.preference.ListPreference; +import androidx.preference.Preference; + public class WifiTetherSecurityPreferenceController extends WifiTetherBasePreferenceController { private static final String PREF_KEY = "wifi_tether_security"; diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index 8e2518d1f95ad1fad64f70987da371779d25c94a..b6db02ce931c07796b4a75500ebfd068525a8a69 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -28,9 +28,7 @@ import android.net.wifi.WifiManager; import android.os.Bundle; import android.os.UserManager; import android.provider.SearchIndexableResource; -import android.text.TextUtils; import android.util.Log; -import androidx.annotation.VisibleForTesting; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -47,6 +45,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import androidx.annotation.VisibleForTesting; + @SearchIndexable public class WifiTetherSettings extends RestrictedDashboardFragment implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener { diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java index 554cc0e32021c1f35b6012aa3b0f9c4bc5eca4e4..594eec731844e7655408fd8a8db2ab2038cc9b13 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java @@ -27,7 +27,6 @@ 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; import com.android.settings.widget.SwitchWidgetController; @@ -35,6 +34,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import androidx.annotation.VisibleForTesting; + public class WifiTetherSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener, LifecycleObserver, OnStart, OnStop, DataSaverBackend.Listener { diff --git a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java index 1cca84287614c74171052cf0eac76ebe45956b36..6386701ea530f46aed46a56fc3ec486bd8370d09 100644 --- a/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/RestrictedListPreferenceTest.java @@ -27,9 +27,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..25380807b78aa28a99783eb7bdf2a8265db3b6eb 100644 --- a/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java +++ b/tests/robotests/src/com/android/settings/SettingsDumpServiceTest.java @@ -16,7 +16,6 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; @@ -28,7 +27,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,6 +43,8 @@ import org.robolectric.RuntimeEnvironment; import java.io.OutputStream; import java.io.PrintWriter; +import androidx.annotation.NonNull; + @RunWith(SettingsRobolectricTestRunner.class) public class SettingsDumpServiceTest { diff --git a/tests/robotests/src/com/android/settings/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/SettingsPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java index a7b91f5fb1fbde2dce1fae37f90b92b30d4ffaf0..e84c373d0674766c57ad730f14223896ef7001b4 100644 --- a/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/SettingsPreferenceFragmentTest.java @@ -26,10 +26,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.content.Context; import android.os.Bundle; -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; @@ -45,6 +41,11 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SettingsPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java index 1b717772a6fe46e6aca2d5a276b2416bc7e54abe..36736ce1e63d7023253d5330f925753cabacb390 100644 --- a/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/SummaryPreferenceTest.java @@ -18,7 +18,6 @@ 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; @@ -30,8 +29,10 @@ 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; + +import androidx.preference.PreferenceViewHolder; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java index 1ccd958cfb369fe4d5aed5821ed41a2b7a64e01e..7ccb219c434be8207ce71b76647b7389b230cb26 100644 --- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java @@ -17,15 +17,14 @@ package com.android.settings; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; +import android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; -import android.net.ConnectivityManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java index a4907dadac1c088534ea47f64b3c31881f30ab5c..db038332a30f6c6b679bb32a05099a1a57937139 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java @@ -17,16 +17,13 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; import android.content.Context; import android.os.Vibrator; import android.provider.Settings; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,13 +31,14 @@ 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; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AccessibilitySettingsTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java index 8392412e325a38761cce8810bbe2983f15508f31..afdeed4e2d893c1b6b7d6aeb120acbee8aeb0e79 100644 --- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySlicePreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.accessibility; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; import android.accessibilityservice.AccessibilityServiceInfo; @@ -37,15 +36,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..30cf139798d3092ff767200409f305ff8e5c58bc 100644 --- a/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/HapticFeedbackIntensityPreferenceControllerTest.java @@ -18,7 +18,6 @@ package com.android.settings.accessibility; import static com.google.common.truth.Truth.assertThat; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import com.android.settings.core.BasePreferenceController; @@ -31,6 +30,8 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) public class HapticFeedbackIntensityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java index 98b1770668f50a0a3e2f630a193a3251c5dcba9c..b4b76d809e5496ec37ed42abcc03481349e9c4f4 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationGesturesPreferenceControllerTest.java @@ -18,12 +18,10 @@ package com.android.settings.accessibility; import static com.android.settings.accessibility.MagnificationPreferenceFragment.OFF; import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON; - import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -35,6 +33,8 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class MagnificationGesturesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java index 128e33bb351b8d0bd1928b8fd43b2736b43f25b6..61309a84343c3c449943d7006a7172ffe01a63ca 100644 --- a/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationNavbarPreferenceControllerTest.java @@ -19,15 +19,12 @@ package com.android.settings.accessibility; import static com.android.settings.accessibility.MagnificationPreferenceFragment.OFF; import static com.android.settings.accessibility.MagnificationPreferenceFragment.ON; import static com.android.settings.search.ResultPayload.Availability.AVAILABLE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +40,8 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.Resetter; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class MagnificationNavbarPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java index dda2ae5e780e68004ce993e8e670440e18b42778..f344f5a695f8b86feaaec812974dc3ba446dc0ae 100644 --- a/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/NotificationVibrationIntensityPreferenceControllerTest.java @@ -21,13 +21,10 @@ 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.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; @@ -41,6 +38,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class NotificationVibrationIntensityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java index c1f54d605248e756df460cd0c3900929d36d41d6..5b69029804f2ae5f066438e80ed36345a9bb71bb 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java @@ -21,7 +21,6 @@ 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; @@ -36,6 +35,8 @@ import org.junit.runner.RunWith; import org.robolectric.annotation.Config; import org.robolectric.util.FragmentTestUtil; +import androidx.annotation.XmlRes; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class ToggleFeaturePreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java index ecd2ff9ce57fcb313a2fa5bda47220834d5c94e7..44b1bc895fe92eba5cb12c39cb39050587a38fa7 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceFragmentTest.java @@ -25,7 +25,6 @@ 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 +32,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 +41,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 8c74edbabc80bd72476c026f50ed5f3e66a0164e..1754aeb78e2a12be6c63670d89d54e60086b2389 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java @@ -19,9 +19,7 @@ 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..5295685935fb000cba4215726ba2547622cd855c 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountDetailDashboardFragmentTest.java @@ -30,7 +30,6 @@ 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; import com.android.settings.dashboard.DashboardFeatureProviderImpl; @@ -45,6 +44,8 @@ import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AccountDetailDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 59b0aeeb6ee0a5219c3569bd8b8af92d64afd960..5567db18bd7793940de0b8c4ec6d3f28a7f45ec9 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -24,11 +24,8 @@ 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 androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import android.widget.TextView; import com.android.settings.R; @@ -48,6 +45,10 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class) public class AccountHeaderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index 1cc0c3a6643f918720c95b0ea1cc4e90b35173fe..de558b34d168bc00ac692f508fb7e95cc153ee65 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -37,10 +37,6 @@ import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -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; @@ -67,6 +63,11 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java index 4e317d7d8cc1c441079c31149541b23375a06eb7..bd7936060230b7e98827c0dead1c599b75d6c4dd 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncPreferenceControllerTest.java @@ -27,7 +27,6 @@ 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; import com.android.settings.SettingsActivity; @@ -42,10 +41,11 @@ 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; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public class AccountSyncPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java index da361852ab18d2ba9b6e4c5d71bba7aa2260d967..38f9830736cb3ca18a5cfc3e1a39da4422eaba97 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountSyncSettingsTest.java @@ -23,8 +23,10 @@ import android.accounts.Account; import android.app.Activity; import android.content.Context; import android.os.UserHandle; + import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowContentResolver; + import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java index 4e42bc90154dea8c739a258a57b6598a446eb480..4a3782121b9f3b86a0ec006c42aed39d05ca9701 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountTypePreferenceLoaderTest.java @@ -29,11 +29,6 @@ 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.PreferenceGroup; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowAccountManager; @@ -49,6 +44,12 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AccountTypePreferenceLoaderTest { diff --git a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java index ba25f207ed34278c2605d6876162750f61f3d275..ebd3beb3195f56779bc110251e6fcb15fdf94bec 100644 --- a/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/ContactSearchPreferenceControllerTest.java @@ -22,8 +22,8 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import android.content.Context; -import android.provider.Settings; import android.os.UserHandle; +import android.provider.Settings; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedSwitchPreference; diff --git a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java index 5db22652de2fccf04314fd28e5525af61027080b..f5e415bd5c3af37a74153e39864c5a152fc54d05 100644 --- a/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/EmergencyInfoPreferenceControllerTest.java @@ -29,8 +29,6 @@ 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; import com.android.settings.R; import com.android.settings.search.SearchIndexableRaw; @@ -50,6 +48,9 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class EmergencyInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java index 56659efb51c34f78dcfe6de50fc6e318b62bf159..311feade8c116c46140197f6d83671df52fa3b8b 100644 --- a/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/RemoveAccountPreferenceControllerTest.java @@ -38,9 +38,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.widget.Button; import com.android.settings.R; @@ -63,6 +60,10 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, diff --git a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java index 1d6579ec8ef6037698f09ca097343ed60bb22b95..f9ac3a64c28722d435f592d4342aa32187510457 100644 --- a/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/WorkModePreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +36,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WorkModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 605b8de1558ea6f533aee6d49ed75995e8370878..035d74e72cd65f53d8f828ac88994e91729251f0 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -31,8 +31,6 @@ 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; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; @@ -54,6 +52,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class AppInfoWithHeaderTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index cb3d3ad7e18d83aea2cbce3ac7f2e43235fc97a2..5bebe5a395c2188d20b6aa5079b62cdaf520fb7f 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -17,7 +17,6 @@ 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; @@ -33,8 +32,6 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PermissionGroupInfo; import android.content.pm.PermissionInfo; -import androidx.preference.Preference; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -47,6 +44,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppPermissionsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java index 8e3bb4254a048c66473b48a61bae0a507d89ace8..327a49962ebdc57999c2c8772159d24d6d287883 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStateNotificationBridgeTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications; import static android.text.format.DateUtils.DAY_IN_MILLIS; - import static com.android.settings.applications.AppStateNotificationBridge .FILTER_APP_NOTIFICATION_FREQUENCY; import static com.android.settings.applications.AppStateNotificationBridge @@ -26,12 +25,9 @@ import static com.android.settings.applications.AppStateNotificationBridge .FREQUENCY_NOTIFICATION_COMPARATOR; import static com.android.settings.applications.AppStateNotificationBridge .RECENT_NOTIFICATION_COMPARATOR; - import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.anyLong; diff --git a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java index fa426291bc87a6366cb8e12e052ae40a27cd8662..a465ff30122af9358c00b2323b7bf0b8713c1b3c 100644 --- a/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppStorageSizesControllerTest.java @@ -5,7 +5,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -17,6 +16,8 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppStorageSizesControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java index ff64a8441619f21bd7950565367bcd705ab7c631..f925a75f09ee02050409fa7fae5a9867444a5146 100644 --- a/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/applications/LayoutPreferenceTest.java @@ -21,8 +21,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import com.android.settings.R; @@ -33,6 +31,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class LayoutPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java index 2876b62f7dc69da9159365232b5fb14363ef2d0f..1bee628583a582c3b02bcebb0045a8316065e571 100644 --- a/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/RecentAppsPreferenceControllerTest.java @@ -41,9 +41,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; @@ -66,6 +63,10 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class RecentAppsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java index bd8b36e470ba72c55a29fb0a33b9f8842094a6e0..224a8f9561bf1d348da7808fcca0d586cb606946 100644 --- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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; import com.android.settings.datausage.DataSaverBackend; @@ -35,6 +34,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class SpecialAppAccessPreferenceControllerTest { 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..3073ee3bc0b358addb236265663c87508e9a29fc 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppBatteryPreferenceControllerTest.java @@ -32,8 +32,6 @@ 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; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -53,6 +51,9 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppBatteryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java index 24579ef961f7819f1b6f62239fa01b1123e76642..cb2f3a0315dcd896f92d89fdecf5384ff819df50 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java @@ -44,8 +44,6 @@ import android.os.UserManager; import com.android.settings.R; import com.android.settings.SettingsActivity; -import com.android.settings.applications.appinfo.AppButtonsPreferenceController; -import com.android.settings.applications.appinfo.ButtonActionDialogFragment; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.widget.ActionButtonPreference; import com.android.settings.widget.ActionButtonPreferenceTest; 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..91d76ac033413783c0279b3de4785342f4e9c1cd 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppDataUsagePreferenceControllerTest.java @@ -33,7 +33,6 @@ 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; import com.android.settings.datausage.AppDataUsage; @@ -48,6 +47,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppDataUsagePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index 1c8569d1c2f8fd05544a14c5a1d97bd5d65d1848..6f36879cc34e636667fc1901b9aaa556562c4399 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -28,12 +28,10 @@ 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; @@ -52,6 +50,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppHeaderViewPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java index 1616c83767af95c74642eefa555410ccc6e10a3e..6796605569a7a3d91ed76a6b147c4cfa5bd38df3 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoPreferenceControllerBaseTest.java @@ -26,8 +26,6 @@ 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; import com.android.settings.SettingsActivity; import com.android.settings.SettingsPreferenceFragment; @@ -44,6 +42,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppInfoPreferenceControllerBaseTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java index b640f9f5ce5add1bc16d013151ea61e06f42bda0..2e988d8f668b14aacb76102f6f797050c5a855b5 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInstallerInfoPreferenceControllerTest.java @@ -35,7 +35,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,6 +46,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppInstallerInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index cd53f8b402f54a99460628625441f03e2d2c11c9..77e1ecaf9a6e7b02e0a477839cbd2c1eb773da9b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -26,8 +26,6 @@ import android.content.Context; import android.content.Intent; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.SettingsActivity; import com.android.settings.applications.ProcStatsData; @@ -46,6 +44,9 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppMemoryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java index a70c3c4097cf65c444405d9e63a830cb52e3ef45..6fdf8944afe2b3666e1b58dffc72e297f25700e6 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppNotificationPreferenceControllerTest.java @@ -29,8 +29,6 @@ import android.app.usage.IUsageStatsManager; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.notification.AppNotificationSettings; import com.android.settings.notification.NotificationBackend; @@ -45,6 +43,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppNotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java index c18e5213bd568f19f9c08fb95cc49568b1244a5d..a18a0417d387c662818545372a7d26a28b17d5c8 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppOpenByDefaultPreferenceControllerTest.java @@ -27,8 +27,6 @@ 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; import com.android.settings.applications.AppLaunchSettings; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +42,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppOpenByDefaultPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java index 505f25ea2e07ac14757a611732ea24f2faffd987..73459c4b6c07283be922c0cba3a9e8ad568bce5d 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppPermissionPreferenceControllerTest.java @@ -27,8 +27,6 @@ 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; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -44,6 +42,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AppPermissionPreferenceControllerTest { 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..76aa9a97c1e024d1cf7b9ad9519cef89cb92a005 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppStoragePreferenceControllerTest.java @@ -28,7 +28,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,6 +41,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppStoragePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java index f577d1ca1ebcfb15ed769599e52e7d79e52718de..0b7ad048f8d5cba6eebe3afb530b258986bbea04 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppVersionPreferenceControllerTest.java @@ -22,7 +22,6 @@ 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; @@ -33,6 +32,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppVersionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java index ae61a51549ec5748695a711dd75a08da866e0d98..794d5e599b37d48a67ea73d9b8c4f75ab6a4e1a7 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBaseTest.java @@ -17,7 +17,6 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,8 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -40,6 +37,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAppShortcutPreferenceControllerBaseTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java index c8f19db21de79ee9d40294f3753295cc46f219dd..20f29bfe9e1a671697d701713a861e9d49a549da 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/DrawOverlayDetailPreferenceControllerTest.java @@ -27,7 +27,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DrawOverlayDetailPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java index ef909070240974871a722aaff0cfcc0025de1a8b..b857308733fe5edfaeee885cb4320a03c8422f0b 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourceDetailPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +35,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class ExternalSourceDetailPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java index c353b1b60061a5f669e6f60f9ba9a9357bd4abc0..7b1989baab4e305c98b510ffdd82d3b0091c3bfc 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonDialogFragmentTest.java @@ -18,8 +18,8 @@ package com.android.settings.applications.appinfo; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -30,8 +30,10 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.pm.PackageManager; + import com.android.settings.R; 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/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java index 32cafeb86c29c5678cdd988707ba186f4ef72342..98e436ec618c1d70dc60c663476ea6db8c4d7b18 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/InstantAppButtonsPreferenceControllerTest.java @@ -37,8 +37,6 @@ 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; @@ -60,6 +58,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class InstantAppButtonsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java index b5b600a18078d03129cbf475947f7435cbba85c6..802bf7b24823b36f5cdc8a93a371af72137312be 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureDetailPreferenceControllerTest.java @@ -23,7 +23,6 @@ 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; import com.android.settings.core.BasePreferenceController; @@ -36,6 +35,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class PictureInPictureDetailPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java index 9cdd2eaaa1c1188ccda468b9bd0ff93464d18f2f..2473881e3c04d0b9d6a57ae194a56774cd11329c 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/TimeSpentInAppPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +38,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class TimeSpentInAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java index e702cd46143d48472ee24b438a42d39644dbf05a..605da601105c88ac536115af09bbf4bf211a576a 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/WriteSystemSettingsPreferenceControllerTest.java @@ -27,7 +27,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class WriteSystemSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java index e83fbf861fe5cf2a86bd7d6999f4c077e4c59dec..1e4de78828fda94dfa6a1ebf590ca3df24ebf123 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistContextPreferenceControllerTest.java @@ -24,12 +24,9 @@ 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.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,6 +39,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AssistContextPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java index dd4422a7f2e5ad45436f5a4000f4252255a6963f..2cb21dbdea90181c43914726bbaea21b5a37fbb4 100644 --- a/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/assist/AssistFlashScreenPreferenceControllerTest.java @@ -26,13 +26,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.ComponentName; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowSecureSettings; @@ -48,6 +45,10 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AssistFlashScreenPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java index 93d594209123fe9209351d7392eeb833dc92e14b..ea49d0720613891a3c870e7cd054dd7f51edf902 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragmentTest.java @@ -26,7 +26,6 @@ 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 com.android.internal.logging.nano.MetricsProto; @@ -46,6 +45,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAppPickerFragmentTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java index 97e38a03c4c3d2b81eb56651938d6c0388e41b6e..f42c2ab67203aa80c7e197915669f7185232c98e 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +37,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java index e3cffb6dc8e4b63a300de29c3cb4279183fd0a79..4e08bad957e3f28107344106dedac6d442602a7d 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; import android.view.autofill.AutofillManager; import com.android.settings.R; @@ -41,6 +40,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultAutofillPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java index d4c4115b6a4b8d085e3a4fceb9f7aea62480be1b..de6d5cfb97e9124037958dd8fcbe22afbe9c7805 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java @@ -34,13 +34,10 @@ import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.os.UserManager; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import java.util.ArrayList; -import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,7 +46,11 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; +import java.util.ArrayList; import java.util.Collections; +import java.util.List; + +import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) public class DefaultBrowserPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java index 0919af6170c6cdec3f353997c5d7a2d351ac0dfa..ce9fe2a837efa050ba94789c9244c031941b089d 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java @@ -32,7 +32,6 @@ import android.content.Intent; 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,6 +48,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Arrays; import java.util.Collections; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultHomePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java index 454a5644781bf6ed29692cf5a7ca534956604609..cfe30cbd11ce4a5292c84c2a7560d1e8ed060a4f 100644 --- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPaymentSettingsPreferenceControllerTest.java @@ -26,7 +26,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DefaultPaymentSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java index 4c94e0a03c5aa70080e03ae40650404ae7fe4417..51b6116c0dad50b1425f4b682d5fccf2a32a62a4 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,42 @@ 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/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java index 8943d72ad33d57b314d2a9a0e4d72d6125900e77..bf29559f628481080b093a7703ced9455c65d024 100644 --- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java +++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java @@ -16,15 +16,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 org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -36,9 +36,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_DRAGGING; -import static androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE; - import android.app.Activity; import android.content.Context; import android.os.Bundle; diff --git a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java index 815263558db4e01fd59790eca38aebc4cf1d3257..95d68d9d123b9243f04e5aceb00b17687db0c132 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupInactivePreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.backup; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +31,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowPrivacySettingsUtils.class}) public class BackupInactivePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java index 5a360cb0daf66397439392cfd2a5d4b32064a49f..3f8c0ef7d23d75fe14d03b2f89a652ffa31aff35 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java @@ -24,7 +24,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,8 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class) public class BackupSettingsActivityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java index 0a258bbe78b23f587790b77730300c4e3c81c239..3d3fec6b9397b8fac699db703ad882e1a3373695 100644 --- a/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsPreferenceControllerTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +36,9 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class) public class BackupSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/AvailableMediaBluetoothDeviceUpdaterTest.java index 0b1311d9364797cc3251c651f03cc5a3948d16cb..cf73d41eb78bd4036f258443af878fc85c593140 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/BluetoothDetailsControllerEventsTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java index 2f838081b0a4fdeb1c5d1ea858cd818c69902e34..9ef3499d7b3386a92203b7983c68af8a306b7520 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerEventsTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import android.content.Context; -import androidx.preference.PreferenceFragment; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowBluetoothDevice; @@ -34,6 +32,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowBluetoothDevice.class) public class BluetoothDetailsControllerEventsTest extends BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java index 0c2a381c59bc33f4e4ee91248d8e9a71afbe61e5..c76ded99535bb51a592c7f6f3fa2eed2faf03472 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java @@ -19,14 +19,11 @@ 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.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +36,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java index 8079592fc1630c10df32dfda237955bebb925375..0389d8cf7f19a63d0c720d11e60636327ee5d4ed 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsHeaderControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.inOrder; @@ -38,7 +37,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..62414e4b52f2b5415bfd21f0e8288f031d214784 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsProfilesControllerTest.java @@ -27,8 +27,6 @@ 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 com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -53,6 +51,9 @@ import java.util.List; import java.util.Map; import java.util.Set; +import androidx.preference.PreferenceCategory; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowBluetoothDevice.class) public class BluetoothDetailsProfilesControllerTest extends BluetoothDetailsControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java index a15d26cc34de165985a2b082ab2e7ceb965734e8..dd5f27810b3a0a7f98690335c01b21948605868e 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceNamePreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; @@ -38,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDeviceNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java index 3ce585ab83c8b341b2368a83f011ceb8e5d36bac..31045a620855d772edd5d44f7f24abd6f396c909 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceRenamePreferenceControllerTest.java @@ -27,8 +27,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.bluetooth.LocalBluetoothAdapter; @@ -41,6 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDeviceRenamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java index c1024c8c3c3ac7dd25b7b5b5a70d921dee14472e..650bab11c50b4277124f43a83b832eef05bb6c81 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceUpdaterTest.java @@ -23,21 +23,19 @@ 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; @@ -46,6 +44,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDeviceUpdaterTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java index 4bb093c8035879491fa9d99e0aa59a102e5c1aba..6936177c582159c242aa50040b532753937d2f3f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothEnablerTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.mock; @@ -32,11 +31,8 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.widget.SwitchBar; @@ -58,6 +54,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class BluetoothEnablerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java index 7d2257af0c37a08bddb29f7dba2b1424454981ba..c3bc9a1880cc0f4e799c000c01916d663211de15 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothFilesPreferenceControllerTest.java @@ -17,15 +17,13 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import 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; @@ -37,6 +35,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothFilesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java index 7dcf76c9c88e2af36c87c8e7087ba7fd491c7537..a4b214185b82417f4047e34e2dd069608ce1d993 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java @@ -30,7 +30,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,6 +46,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceGroup; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothPairingDetailTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java index 7a0a05d0cdbfbb3b8fa85acf66231e21d01f1abf..f53a2f5f72d7baf64b2b71bda844981320b0497f 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -25,7 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.Intent; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -39,6 +38,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothPairingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java index 20bab8713f7d6ab2b1144c8509a6c6f49d34b7f2..f85a58401c147591bf80fb8bef40d06715d60040 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSliceBuilderTest.java @@ -18,12 +18,13 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,9 +34,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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java index ccd57f5d66f589913cb73b9996c1319c075e849f..9f9aaf4ec3e2c4879d2bbf0577d521d0883103a0 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothSwitchPreferenceControllerTest.java @@ -17,10 +17,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 8120d91d28f498fb6c048113eedcfac421c55bed..bf882456af9fff30639154dfc352e766bee9f49d 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/ConnectedBluetoothDeviceUpdaterTest.java @@ -16,7 +16,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -24,8 +23,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 +33,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..7aacd38f672863262feb50b55fa748fabdc861fb 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.res.Resources; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +43,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DeviceListPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java index ac08e9ec404b81ad1b76a8c9a013e6a049ab0f59..1065eb61ceeefb142c8effc4570d4f59c33205f8 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceProfilesSettingsTest.java @@ -22,7 +22,6 @@ 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; @@ -44,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/LocalDeviceNameDialogFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java index ceae15d4e2fe2383447fb3bc94d0782a16ef03a6..03b6bc0e2199eed4aedc085f74d1f36122acc106 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/LocalDeviceNameDialogFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.bluetooth; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; 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..c3ba7d1c85af6ae20cb1ad2fec5d922187cc5c05 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java @@ -17,11 +17,8 @@ package com.android.settings.connecteddevice; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.assertTrue; - import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; @@ -29,9 +26,6 @@ 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 com.android.settings.R; @@ -49,6 +43,8 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class AddDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java index ce5580242f22ad4bcf9ed00749becac7cd60b632..13c5d82f2195b607f34831995b7be5ba42a6525c 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java @@ -16,13 +16,18 @@ 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 +37,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..0c79f4927bd9c641358522fff87f877be5787f69 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java @@ -17,7 +17,6 @@ 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.ArgumentMatchers.any; import static org.mockito.Matchers.anyString; @@ -29,10 +28,6 @@ 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; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.bluetooth.AvailableMediaBluetoothDeviceUpdater; @@ -53,6 +48,11 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, 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/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java index eecbca5afe2192c5d0bed6601fc67e678999934e..4529f03838af59ab76ef65331a56a88c81982009 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java @@ -19,9 +19,7 @@ import static com.android.settings.connecteddevice.ConnectedDeviceDashboardFragm .KEY_AVAILABLE_DEVICES; import static com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment .KEY_CONNECTED_DEVICES; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java index 52715b084df248eb7f2516c7b6a26e004a31783d..bd47f8b2ef958c1ca3264f616458349c75d9fc94 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceGroupControllerTest.java @@ -17,22 +17,15 @@ 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.Matchers.anyString; 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.pm.PackageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; @@ -51,6 +44,11 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplicationPackageManager; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowApplicationPackageManager.class) public class ConnectedDeviceGroupControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java index 978db987d07fa6f35f4802bca63fa137b047e0b4..e7123f40d941139402cfe15b93d2d8621f64255e 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/DiscoverableFooterPreferenceControllerTest.java @@ -28,11 +28,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.text.BidiFormatter; import android.text.TextUtils; -import androidx.preference.PreferenceScreen; -import com.android.settings.core.BasePreferenceController; -import com.android.settings.bluetooth.AlwaysDiscoverable; 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; @@ -53,6 +52,8 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowBluetoothPan.class, ShadowBluetoothAdapter.class, ShadowLocalBluetoothAdapter.class}) diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 6e69e67ba0cdf0ca19249f88909f65425ba6922c..f89bcce9fb2a724ed4120e1e601f88f1b88c6bda 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -15,9 +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; -import androidx.preference.Preference; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; @@ -31,10 +37,7 @@ 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.*; +import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) public class PreviouslyConnectedDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java index b1d4cd81c27cdaf5403963502f9dba0e763b384a..a6cac5dfdcbad23203f766d5dfe4cac290d7615f 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/SavedDeviceGroupControllerTest.java @@ -18,14 +18,13 @@ 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.preference.PreferenceManager; + import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; @@ -40,6 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; + @RunWith(SettingsRobolectricTestRunner.class) public class SavedDeviceGroupControllerTest { private static final String PREFERENCE_KEY_1 = "pref_key_1"; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java index ad04e7e52ab91249876b1faf9278bec6f6a4f625..306803225e7c72d7efb908a9088e674ba6f44c63 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdaterTest.java @@ -16,7 +16,6 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.verify; import 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..072da644df2bc95a3edac4d6b04f56f8cc7fa7d4 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsDataRoleControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,9 +26,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +40,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsDataRoleControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java index 989a293fc1d1a0b9f63baab2d7b3a08cce6521ac..09a34ec5f2b6c0aeb8a7573ebc4bbd7a84fe9459 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.connecteddevice.usb; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,9 +25,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; @@ -47,6 +43,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class UsbDetailsFunctionsControllerTest { diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java index 7550b451630350399b2c2dff243fd4af5afefc22..408f6d0081bed4691a6526a93c197f35218fdeea 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java @@ -20,13 +20,9 @@ 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.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.applications.LayoutPreference; @@ -45,6 +41,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class UsbDetailsHeaderControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index 16830668a06985be783bc53c6618ebefa523a3cd..8b5ef416a878a9e626aaf2277cd77569e0ae7f3a 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -25,8 +25,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -39,6 +37,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class InstrumentedPreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java index ff95841d4f3b0dae8dd43643b2a9cd2afac40ea5..4224462f926f8f849e00be061224e317ab0256c6 100644 --- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java +++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java @@ -17,7 +17,6 @@ package com.android.settings.core; import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEYWORDS; - import static com.google.common.truth.Truth.assertThat; import android.content.Context; 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..034733662120ca7c1f14d48f813746681fb1a2fa 100644 --- a/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/SliderPreferenceControllerTest.java @@ -17,7 +17,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -27,6 +26,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SeekBarPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class SliderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java index beaaa52a82e8c9cd2a6c7aa10beb6e7f95e9d208..ae5d7aaf0bb16d25b620ebc738d27f96625d4adc 100644 --- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java @@ -18,7 +18,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -28,6 +27,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class TogglePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java index 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 67a79fa7ee1f5a1421d52ada71ebe5c280c87dea..f6786b8221599f94e1083f756f9dce89e148830e 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java @@ -33,7 +33,6 @@ 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; @@ -64,6 +63,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.SettingsShadowTheme.class) public class DashboardAdapterTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java index 94126da5ff30c0bbfcbc0bc1d891f09046e01805..a4cbc9d86db86e3ec1e759b6aee02ab034146f54 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardDataTest.java @@ -26,9 +26,6 @@ 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; import com.android.settings.dashboard.conditional.AirplaneModeCondition; import com.android.settings.dashboard.conditional.Condition; @@ -47,6 +44,10 @@ import java.util.Collections; import java.util.List; import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.ListUpdateCallback; + @RunWith(RobolectricTestRunner.class) public class DashboardDataTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index 78d3a09adf52f967af8344ef58cfa6345e66b21b..7cfdf3255d9c5c5550c078290b54e0dbe10e1e91 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -39,7 +39,6 @@ import android.graphics.drawable.Icon; import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; -import androidx.preference.Preference; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -71,6 +70,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class DashboardFeatureProviderImplTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index 7638a07f573f3ffc0b5d496d79811e55c6444f06..3a2f00f8924ed8da41965824debc72886083e6b8 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -29,9 +29,6 @@ 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; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.testutils.FakeFeatureFactory; @@ -53,6 +50,10 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java index 7bcd80d6fc8de84a81c52202d43818a02f4b5d86..ee19654b7cdfd7036eaf593987d49ed6b0e7a177 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardItemAnimatorTest.java @@ -18,7 +18,6 @@ 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; @@ -30,6 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) public class DashboardItemAnimatorTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java index 189dd6b8f375c381cfe94c94414917ef2041812b..3b3b2a2286111815b5beb8c03c295d4842c48627 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardSummaryTest.java @@ -29,7 +29,6 @@ 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; import com.android.settings.dashboard.conditional.FocusRecyclerView; @@ -47,6 +46,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.recyclerview.widget.LinearLayoutManager; + @RunWith(SettingsRobolectricTestRunner.class) public class DashboardSummaryTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java index e7014df7c6ac0316da6672d1fb6751aa37f3af35..77f7fde7e1b18214a6868ac9266ac1d51a737af7 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DashboardTilePlaceholderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java b/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java index 84093c47c8584a5bb6ca41d01333e6f6ffa3dedb..fa05ae030f64306f6352bc988a0c0532649b0074 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/BatterySaverConditionTest.java @@ -17,7 +17,6 @@ package com.android.settings.dashboard.conditional; 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; 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..62d1dfaa6af4eef7771c572874ce1e36f0f1aa4a 100644 --- a/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/conditional/ConditionAdapterTest.java @@ -20,7 +20,6 @@ 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; @@ -39,6 +38,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) public class ConditionAdapterTest { 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..29ad60f713b6e6656fb132e77d17af48afca656c 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,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.never; @@ -23,8 +24,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/suggestions/SuggestionAdapterTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java index 586bbd100158f954c69dbf660b4c3a91709e0823..49534833c06c1ff003b8b5a4b84a09191e0b2ee5 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java @@ -27,9 +27,9 @@ import static org.mockito.Mockito.when; import android.app.PendingIntent; import android.content.Context; +import android.content.res.ColorStateList; import android.content.res.Resources; import android.content.res.TypedArray; -import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; import android.service.settings.suggestions.Suggestion; @@ -46,9 +46,9 @@ import com.android.settings.dashboard.DashboardAdapter; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowCardView; +import com.android.settingslib.Utils; import com.android.settingslib.suggestions.SuggestionControllerMixin; import com.android.settingslib.utils.IconCache; -import com.android.settingslib.Utils; import org.junit.Before; import org.junit.Test; 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..e7eec3661e0ba5944cced7ce0d69fb8cc97badd5 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -26,17 +26,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 +51,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/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 711a2787f51e62275e58a33b254c70f30e6504b0..230aee9705af4bf06b1c1ee60130d7622890fb17 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -31,8 +31,6 @@ 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; @@ -56,6 +54,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowRestrictedLockUtils.class}) public class AppDataUsageTest { diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java index 40c22c7444c6ddfcff9724943dded0bb077ee85e..13072d587edc9e8a623f841c24f4bdf8358479c9 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java @@ -26,7 +26,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +37,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppPrefLoaderTest { diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java index dd05b772ea57506caaca154aa230b006a3efdb51..62751dd9ee70a330e8dd5e581ade501eda9fb77b 100644 --- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java @@ -20,7 +20,6 @@ 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; @@ -36,6 +35,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class CellDataPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 17598eb39670439c7a5f5f9a4db7129f75af6fbb..d8e447da8c7dac083397a95a62d1b2d17f4bfc99 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -19,7 +19,6 @@ 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; @@ -32,7 +31,6 @@ 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; @@ -52,15 +50,17 @@ 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; import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.mockito.ArgumentCaptor; import java.util.concurrent.TimeUnit; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) public class DataUsageSummaryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java index e8d70f636de631a81e5a9022d117738a1e010ccf..5b724715b39787306fca7c1e6849593d9da4eaaa 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java @@ -18,7 +18,6 @@ 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 +28,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; @@ -57,6 +55,8 @@ import org.robolectric.shadows.ShadowActivity; import java.util.concurrent.TimeUnit; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResourcesImpl.class) public class DataUsageSummaryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java index 69f4e0f32ef390e45f2ae517170197da1442c2fd..66bcfbd61348e2d6d2705bb48d88694cd4335537 100644 --- a/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceControllerTest.java @@ -31,8 +31,6 @@ 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; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; @@ -56,6 +54,9 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowRestrictedLockUtils.class, diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java index 8a3f8d34624418388c024938e2850e0765dae735..762642d9a9e556aadfd779f66ea51c199cbf5b49 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeFormatPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +36,8 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; import java.util.Locale; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AutoTimeFormatPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java index d0bacf7801e26c5931987ff37dc001ce9932a54e..0193484b9cada3e83f020241888ead17322af77b 100644 --- a/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/AutoTimeZonePreferenceControllerTest.java @@ -23,7 +23,6 @@ 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; import com.android.settings.testutils.shadow.ShadowConnectivityManager; @@ -36,6 +35,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowConnectivityManager.class) public class AutoTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java index 58862ee2cb2730a410d66140863e1502ca8ebf6d..244ca5cc0f9624de5eaf78f174e38cea3aca0bfd 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimeFormatPreferenceControllerTest.java @@ -22,8 +22,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.robolectric.shadows.ShadowApplication; import java.util.List; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class TimeFormatPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java index de330855f13b2142455083e60e633a260e77d2f6..b1b14f57330d14b288f3d4889f715bebafd3e785 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZoneAdapterTest.java @@ -16,7 +16,7 @@ package com.android.settings.datetime.timezone; -import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; +import static com.google.common.truth.Truth.assertThat; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -29,7 +29,7 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static com.google.common.truth.Truth.assertThat; +import androidx.recyclerview.widget.RecyclerView.AdapterDataObserver; @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..d801e8c4a488370a801139955757f23761e44b4f 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceControllerTest.java @@ -16,9 +16,10 @@ 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 +27,8 @@ 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; +import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) public class BaseTimeZonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java index 9d650cc45afd627774e370af7140517d2dd33133..d2457f57aac3b89ccbd4b48784e75e709cb2f8a8 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,10 @@ 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 +38,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..1d119e737a8b7f96384e9432e9dc40a5585482df 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPreferenceControllerTest.java @@ -16,9 +16,10 @@ 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,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; +import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) public class FixedOffsetPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java index e07d8a687b6097bd2d48d76ba5a03b7bcb52aa87..878384e0446f1bf388739e7204c13ca0555562c1 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionPreferenceControllerTest.java @@ -16,8 +16,9 @@ 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,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; +import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) public class RegionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java index 02a3122cb9edfda295167b3640e522a317d167a9..ffda30d837975911007e8e2c19edadafec41b1ee 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java @@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone; import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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..9478e06a44d3da8489ce99d19abe91340eea655a 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePreferenceControllerTest.java @@ -16,9 +16,10 @@ 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,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.Robolectric; -import static com.google.common.truth.Truth.assertThat; +import androidx.preference.Preference; @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/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java index 948a92725a281188fc2bf8e08a671aecb83f0e93..b5522b39d829161a53d992ad56c08a15cc3efc4b 100644 --- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java @@ -19,8 +19,6 @@ package com.android.settings.datetime.timezone; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.spy; -import androidx.preference.Preference; - import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,6 +29,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.Date; import java.util.Locale; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class TimeZoneInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java index 9e72d9896aadcf43c863dc548a3f5f8a7649ba46..f95260592dc6f94544bf169e6e96050e061036ea 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerDescriptionPreferenceControllerTest.java @@ -6,8 +6,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -21,6 +19,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AutomaticStorageManagerDescriptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java index 8a8c5a134f5eebfa5857654ccf1eabd356d482b1..14a6211e0e0a60765a752cef40f800a5bf4e9e69 100644 --- a/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/deletionhelper/AutomaticStorageManagerSwitchBarControllerTest.java @@ -28,7 +28,6 @@ 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; import com.android.settings.testutils.FakeFeatureFactory; @@ -44,6 +43,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AutomaticStorageManagerSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java index 2c0676dd541b9b021e4a0c60459a497d5805f033..b876de09d98736d1d033190c1c9852afea78784e 100644 --- a/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AbstractBluetoothA2dpPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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,12 +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.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothCodecConfig; import android.content.Context; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,6 +40,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AbstractBluetoothA2dpPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java index c91dea9c6e4d755305d5b0d6ef6311c88109677a..2e8ff8528e61a610ad97e7ed04f54b21121453f4 100644 --- a/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AdbPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AdbPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java index 24acf7316ba5ffc0c0af2a59c72d162239f3c2df..b5a27234673c50be856f5f0f3de6396c27a72dee 100644 --- a/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AllowAppsOnExternalPreferenceControllerTest.java @@ -16,16 +16,16 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AllowAppsOnExternalPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java index e793cbbc1a465e5c27a74033fe584dbd6bf7c521..1312c89dfa83c16ed6f86416aabe7340b1783b2c 100644 --- a/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AnimatorDurationScalePreferenceControllerTest.java @@ -16,15 +16,15 @@ 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 androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.R; @@ -38,6 +38,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AnimatorDurationScalePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java index 720c08193014f58409b8f6ab9b051a06589fee43..358c824f48722566167d6de77fd58fc905bafa8a 100644 --- a/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/AppsNotRespondingPreferenceControllerTest.java @@ -16,16 +16,16 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppsNotRespondingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java index 1e2e44eae514600ce1032089d2189ba0dd847dc5..c58fa6412c3fac7bba37ff204d9d963079d596e8 100644 --- a/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BackgroundProcessLimitPreferenceControllerTest.java @@ -24,8 +24,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BackgroundProcessLimitPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java index bf6ed9483cd74b22a5e77316c6f0ff2809632414..75c0f458ddef861b12b0b9310274f5bd75430d5a 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothA2dpHwOffloadPreferenceControllerTest.java @@ -16,16 +16,14 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothA2dpHwOffloadPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java index 3da315a0b64dba94ef91a7427d756fe84c74a7d3..76696d266f6d8b928f5f6101d9423a9c30aaa681 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAbsoluteVolumePreferenceControllerTest.java @@ -16,15 +16,14 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAbsoluteVolumePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java index 5c24bc76f77b43d6779c6097aac4b10161f3ec94..482770017ae31b8ddfad86c577ece5e5ca9225fd 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceControllerTest.java @@ -21,11 +21,8 @@ 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.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,6 +34,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioBitsPerSamplePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java index d1305971dadd5ba0037f49e0b5a0f071a337d62c..b857730d34bb30ca6a851454b75b5128bb55f8f8 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioChannelModePreferenceControllerTest.java @@ -21,11 +21,8 @@ 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.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,6 +34,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioChannelModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java index 4f0815f367eb41b5e0e9994d775b2764fe7a8c2f..cf24c091b5c47ba0a625f535e8c5addc25180d51 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioCodecPreferenceControllerTest.java @@ -21,11 +21,8 @@ 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.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,6 +34,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioCodecPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java index 168c61aa24db13a16864629beacb596e728ee4be..dd9fa05bcd495b5f5f4fa2908192c12b8f0b1ad1 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioQualityPreferenceControllerTest.java @@ -21,11 +21,8 @@ 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.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,6 +34,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioQualityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java index 3c62d2900f086ec780586365ffec3170de40fbff..1654a68df3c973068b6f8afdacadc79980f669ff 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAudioSampleRatePreferenceControllerTest.java @@ -21,11 +21,8 @@ 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.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,6 +34,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAudioSampleRatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java index 6da67ffc8e501cde9672aa7aca1bfc9da03d7eaf..2441a4719e5b4a5c9c9c2680f415dd9208fc5db5 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -24,8 +25,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothAvrcpVersionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java index 2bd3b09bfb7d7066facdf149a2099aaaea8cba06..23ea1e8898c06388f23ce55728f6bb7985e9bde7 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothDeviceNoNamePreferenceControllerTest.java @@ -16,14 +16,13 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +34,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowSystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothDeviceNoNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java index 76eb4ac57b4c39751181a8164ae92cd513d95d4f..a454b8e3448bffc2fc5f389bfeccb520f90b189f 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -24,8 +25,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +37,9 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothMaxConnectedAudioDevicesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java index 98c0b8372cb35168b328545e3cb9f02ee19b7536..b4038a76cb98ade5e0538d113e371a4ac27e69d9 100644 --- a/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BluetoothSnoopLogPreferenceControllerTest.java @@ -16,15 +16,14 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothSnoopLogPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java index f2593fceeef3ac50cd96a5c9303615e70e0118b0..af63dc34ea5fa3a72a2f82282b0ca2acc796ce0e 100644 --- a/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/BugReportInPowerPreferenceControllerTest.java @@ -16,8 +16,10 @@ 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; @@ -27,8 +29,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BugReportInPowerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java index b61f49ae2f817f960f87f98ea396e3edf8076ce8..033cb260dd3c890b5c17291b798eb837c0786c5c 100644 --- a/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CameraLaserSensorPreferenceControllerTest.java @@ -17,15 +17,14 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +36,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class CameraLaserSensorPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java index 6f7c22414bbfd4726a2e8258323f5a0899d8ab06..05f482425cb4d55de72016537cdb03a155b9f735 100644 --- a/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ClearAdbKeysPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -29,8 +30,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowUtils; @@ -47,6 +46,9 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class ClearAdbKeysPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java index 67ba7c4ed33cb24878af6dc95cae9a50623a04e6..4b9280173b986e510c6538f9ebd73c0990dc7c80 100644 --- a/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/CoolColorTemperaturePreferenceControllerTest.java @@ -16,15 +16,14 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +35,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class CoolColorTemperaturePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java index 9ddfc4b45e0df09018e2b120ac1c2a551aefb450..3578beb4dd864d06288f72dd3e17419f84a4930e 100644 --- a/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DarkUIPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.app.UiModeManager; import android.content.Context; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DarkUIPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java index 52ca56e80bab2fe24738725a25cb7cc4fbfddeda..f24034059433cae8de677a4780ec7d91ec690e8f 100644 --- a/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugGpuOverdrawPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DebugGpuOverdrawPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java index fca76a4860cd73278e9d30ef646f40f1f9eddfd5..4a63783d377a6345406f9e628b0970b895f228a1 100644 --- a/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugNonRectClipOperationsPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DebugNonRectClipOperationsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java index cddee7f683cacef6e14bb91c516fa8ae21002dd5..7c4cc979bac651fee7dc94f33232180c1e8edb1e 100644 --- a/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DebugViewAttributesPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class DebugViewAttributesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index c2ad6c34615f24d0d7d937989400fb2c980e3f7e..e026ca1e829e8b2ffddcebc48234564d4ad6fa40 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -21,8 +21,6 @@ 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; @@ -45,6 +43,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class DevelopmentSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java index 3e0d118df0a83cebbc07974e04753ff5f68240dc..08f5e0b8878d4570d8de838735468c9ba8cff91b 100644 --- a/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DisableAutomaticUpdatesPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class DisableAutomaticUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java index fd063cb37b6cee9231e578adb723f15a59890774..c77fcab2c532fe3eb3417f2d7602a1b81406165c 100644 --- a/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EmulateDisplayCutoutPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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; @@ -30,8 +29,6 @@ import android.content.om.IOverlayManager; import android.content.om.OverlayInfo; import android.content.pm.PackageManager; import android.os.RemoteException; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.DisplayCutout; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,6 +42,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.Arrays; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class EmulateDisplayCutoutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java index c16f4538b080c23a340d3ac9ba1fc5de2d0b52f6..bb7b3adc050834dd33c35bfb9ada6765f38a1f39 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGnssRawMeasFullTrackingPreferenceControllerTest.java @@ -16,16 +16,16 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class EnableGnssRawMeasFullTrackingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java index f3b57306067219ddc804e0ab01efbd975bb4480d..01764646ef840cf0d318e76cf3e50fceec8938d5 100644 --- a/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/EnableGpuDebugLayersPreferenceControllerTest.java @@ -16,16 +16,16 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class EnableGpuDebugLayersPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java index dd16a284be92d05066f76390243114c0a491e283..65ca41a66d15bd26c73589017dac3dca749ca6af 100644 --- a/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FileEncryptionPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -28,8 +29,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,6 +41,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class FileEncryptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java index aceb714cf40cce943bc9d1ecf6e897caf2f66408..9d3ff8dcf543d50ed58e1361d2a6546aa7009b17 100644 --- a/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ForceMSAAPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ForceMSAAPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java index 7f97adc90c3f2bda68de575b9a03255bb1437600..fd5175c45180aaeba381c39d7bb4e1ef0dc5478d 100644 --- a/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/FreeformWindowsPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -27,8 +28,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class FreeformWindowsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java index abc1c91b273f942df0622e2d30ad22d19b1a86a9..c15b6ec5e1ee4c423852f3309e85cc0142e9dbb7 100644 --- a/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/GpuViewUpdatesPreferenceControllerTest.java @@ -22,8 +22,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +33,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class GpuViewUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java index fcf6b898db9c77e9cffedfb510792c3158313000..df747c5e0b78f5e9d79cdd8ff21784d9f73b1ab5 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareLayersUpdatesPreferenceControllerTest.java @@ -21,8 +21,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class HardwareLayersUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java index db7e54694fd7318e8122d043ea454253a05d643d..7da9ad28edac093eccb597b772583736cfe08078 100644 --- a/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HardwareOverlaysPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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 +31,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; @@ -44,6 +43,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class HardwareOverlaysPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java index 4c65431cad82de897f53875ba5a1a3b7631f2324..29ec6a062011dc7caf132fc7f643d0c055382e5b 100644 --- a/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/HdcpCheckingPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -25,8 +26,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +37,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class HdcpCheckingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java index 3a1cc1976a45cd6f8c767e2c73ed1443c2ed99be..0df11af806cb66ee2542bf505489860b2808d448 100644 --- a/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/KeepActivitiesPreferenceControllerTest.java @@ -26,8 +26,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class KeepActivitiesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java index a86e18df3ed6ecb974d5734e78b0f3786a226ae8..8b80831cdfd631e571a78041dd404c58d237743f 100644 --- a/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalBackupPasswordPreferenceControllerTest.java @@ -11,8 +11,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -25,6 +23,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LocalBackupPasswordPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java index 361c54d1d653f387c0a87a024231725e79763c5d..5bcfa3dc5180e87d9dbf9276f4a93310a619b062 100644 --- a/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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 +27,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +36,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class LocalTerminalPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java index d65e830e92fdaf587baf8d15f1841e71b35b1559..51dd34a6ddc8d35ae04bea07fc9e94eae40f745b 100644 --- a/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogPersistPreferenceControllerTest.java @@ -20,11 +20,8 @@ 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.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -36,6 +33,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LogPersistPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java index f552a1706434f49e8caa44a192336fd3ce4a18b4..3ea25e1b70322366af58b3e434aa6457d1c9c460 100644 --- a/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/LogdSizePreferenceControllerTest.java @@ -20,8 +20,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.R; @@ -33,6 +31,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LogdSizePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java index 481e59869b2db1335d8b6ebeb9f6cb6443067f84..14ecc3aa6e6c14e0212f9a3baccf5f47555ee4b1 100644 --- a/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MemoryUsagePreferenceControllerTest.java @@ -23,9 +23,6 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.applications.ProcStatsData; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +33,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class MemoryUsagePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index ad3345536a2d8b65f7dc329ea8dbb2f3163f428d..a7e28b21ed00fb74fd81342496ce9c2fd9ad76aa 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class MobileDataAlwaysOnPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java index e6a2d5ce3518a89e3491a46fb8be2f9e3f1b6032..dbac1baccdd2a1df16d81ec106f37042e7491c7b 100644 --- a/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/NotificationChannelWarningsPreferenceControllerTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class NotificationChannelWarningsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java index ce57fb51ddbd85369f469687bd1f99fc30ee167c..8889ed1e77d2ccf6e1360747077b83d99316e84a 100644 --- a/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/OemUnlockPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -31,7 +32,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +44,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class OemUnlockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java index 28f369fec86bbf831a12d118570769e64ea9f6a5..cdbcb5ceb4f91e4b0cb3fdfc95cf422f79ec5b4b 100644 --- a/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PictureColorModePreferenceControllerTest.java @@ -24,10 +24,8 @@ 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.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +37,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class PictureColorModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java index 430e0ddcb19cc9bb61ded0d6297ffcfa899d1c6f..55234b81ea47c35518075f8ded1b161741337e26 100644 --- a/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/PointerLocationPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class PointerLocationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java index 350122650b3a2352e38b7c715be2b40d093bb71b..68f11606f43c66ca1ddb26d91ec391ebded97ab4 100644 --- a/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ProfileGpuRenderingPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.ThreadedRenderer; import com.android.settings.R; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ProfileGpuRenderingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java index 8785cf6a5ec23ee2a5ecf9acae70e0a09d989f6a..4808cefdd53b011164928ac7b2ba2c092531858a 100644 --- a/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ResizableActivityPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ResizableActivityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java index 8e59b84e5c78edadbe961cf23dced00c8a844bdc..f490add98480b48c1267008f9e3d7f69424a1d76 100644 --- a/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RtlLayoutPreferenceControllerTest.java @@ -24,8 +24,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class RtlLayoutPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java index 78387e39e711472bbd099edf428ed722ffb41f48..d29113030b465faccd5d85cb5e02ef8a08d72e8a 100644 --- a/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SecondaryDisplayPreferenceControllerTest.java @@ -23,8 +23,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SecondaryDisplayPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java index 90b2e8263de38229533186ffb9cef166ed7d2c44..85a3b63cce325a2a78427eea7199e37c4ccbf7ef 100644 --- a/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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; @@ -29,8 +30,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +42,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SelectDebugAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java index 46c214740de6724566d601bd68a45538ded788f9..6b5202d96682501bb29a8ef5918b9bf5a0e14416 100644 --- a/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShortcutManagerThrottlingPreferenceControllerTest.java @@ -23,8 +23,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ShortcutManagerThrottlingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java index d373f1c09ada5c7425201e88f9f5b17b0b827a11..2080493801c90974178c7d820f1cbc1c3a97f3c6 100644 --- a/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowFirstCrashDialogPreferenceControllerTest.java @@ -16,15 +16,15 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ShowFirstCrashDialogPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java index c18857acce22b7403d4f0077c4231a91fc30269f..ee32c0bcf6dc63d568fc4b20d4541fb92f170a60 100644 --- a/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowLayoutBoundsPreferenceControllerTest.java @@ -21,8 +21,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ShowLayoutBoundsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java index 811550ff92e352572aab37cea848c8d9564a5cb0..46e50fe1da09d9d2efc68d800c3736c56ab78cfe 100644 --- a/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowSurfaceUpdatesPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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 +31,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowParcel; @@ -44,6 +43,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ShowSurfaceUpdatesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java index d7eaecdb68251550f02b20d0e3d4b6d675f51f54..4fa5bf93049a6aff21cc64ffdad20a78434fc126 100644 --- a/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/ShowTapsPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ShowTapsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java index c136a29cb65ed95693d600bd5bac2009d032d805..9760b55ba76e7742313f959aae0de167eb240661 100644 --- a/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/SimulateColorSpacePreferenceControllerTest.java @@ -16,8 +16,10 @@ 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; @@ -26,8 +28,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +39,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SimulateColorSpacePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java index 40d439fe6d9f6995e9e225b862fbc7aea60d189f..ad773d70d20a0c89a20fafe5b56e07d4a7af9889 100644 --- a/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StayAwakePreferenceControllerTest.java @@ -26,7 +26,6 @@ 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; import com.android.settingslib.RestrictedLockUtils; @@ -41,6 +40,8 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class StayAwakePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java index 1f0c9c553e56b2b2811490ebb8ade34306b341ad..f73ce463d42dbadfbf373d81a3ca5659cf7dc2a7 100644 --- a/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/StrictModePreferenceControllerTest.java @@ -23,8 +23,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class StrictModePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java index 895722e6257656b936ab6f341e1bd478b664b475..832deb81a03a65aba48a90ee8a941a5d14ccf65c 100644 --- a/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TetheringHardwareAccelPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class TetheringHardwareAccelPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java index e5c3e43abbc2f8e6f2ca0224926b26246be1f0ab..646057092bd3203beec2b43a4c5367090879c5c3 100644 --- a/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/TransitionAnimationScalePreferenceControllerTest.java @@ -16,16 +16,16 @@ 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 androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.R; @@ -39,6 +39,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class TransitionAnimationScalePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java index ba27bfb0b2990f98fc3222cfe6c80a435f1e984b..7fd31c84cea8101a25c52376a90f1c5dd04d7431 100644 --- a/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/UsbAudioRoutingPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class UsbAudioRoutingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java index f6447fe0243e4328679700b524a49f4b4e129af4..cbee66e7484030b1a097a5e09045970a44af01f4 100644 --- a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java @@ -20,7 +20,6 @@ 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; @@ -30,7 +29,6 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.provider.Settings; import android.provider.Settings.Global; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; @@ -47,6 +45,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; import java.util.List; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class VerifyAppsOverUsbPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java index b152ea7c734b2913e01181d5fbe4fc4372f1b1e5..4171267d76ed67dc16d84fb520b001a2ee7aa339 100644 --- a/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WaitForDebuggerPreferenceControllerTest.java @@ -16,8 +16,10 @@ 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; @@ -32,8 +34,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +44,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WaitForDebuggerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java index cc60b87845b5c9a1e34d9d5f41d82ec1e191f0da..c68c2f2dd30a871c051a99d57fdf31a381c569fe 100644 --- a/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java @@ -23,9 +23,6 @@ import static org.mockito.Mockito.when; import android.content.pm.PackageManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.webview.WebViewUpdateServiceWrapper; @@ -39,6 +36,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WebViewAppPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java index e09b9d9a0d65b3541a10887cd6c85725a2338cd3..dafa5f2e42bcc00820a28a4324b39ff0666fbfc8 100644 --- a/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiConnectedMacRandomizationPreferenceControllerTest.java @@ -16,15 +16,15 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +36,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiConnectedMacRandomizationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java index 528f3abc6c2d542b63470f3a313bf071def4fa1a..cf03aed13cba66721678818d9891c9fa06b87b4b 100644 --- a/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiDisplayCertificationPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +32,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiDisplayCertificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java index 1359e992fee6541d432d5ae74e24761e9d643192..72e8704543473ac3a3002bd17413e0ab6f793a85 100644 --- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java @@ -21,8 +21,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.net.wifi.WifiManager; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +30,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiVerboseLoggingPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java index e2db4f95d55f5260306010d5b60456672592781a..f0bb2ddb1a66472f2f2f37239073d42e6b40e5f0 100644 --- a/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/WindowAnimationScalePreferenceControllerTest.java @@ -16,16 +16,16 @@ 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 androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import android.view.IWindowManager; import com.android.settings.R; @@ -39,6 +39,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WindowAnimationScalePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java index 5fff256035e6b23d926b1672fb70d263cc172aab..3a9d89a5daccc8586d9609697209fd599e85c000 100644 --- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPreferenceControllerTest.java @@ -23,9 +23,7 @@ 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.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class FeatureFlagPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java index 09027050ed7cb620bbe264dd60f84e2a04cde047..3043019b6d58c25d3935d2f43660a1738371ef05 100644 --- a/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/qstile/DevelopmentTilePreferenceControllerTest.java @@ -30,9 +30,6 @@ 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 com.android.internal.statusbar.IStatusBarService; import com.android.settings.R; @@ -49,6 +46,10 @@ import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class DevelopmentTilePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java index 0011b1534b7d9e4f50c899e09a8f65abe3a881eb..63faa601ad51c2fd0f637697dc735d4d06fbe802 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/BuildNumberPreferenceControllerTest.java @@ -27,14 +27,11 @@ 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 androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.text.BidiFormatter; import com.android.internal.logging.nano.MetricsProto; @@ -57,6 +54,10 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowUserManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUtils.class) public class BuildNumberPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java index 3e4b4e6fe2eb50db6ada7c897dd7b554e3c860e2..0e6bf8d3229748cc621a8bef328a5e050a628df2 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.deviceinfo; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.never; @@ -29,7 +28,6 @@ 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; import com.android.settings.widget.ValidatedEditTextPreference; @@ -45,6 +43,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DeviceNamePreferenceControllerTest { private static final String TESTING_STRING = "Testing"; diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java index e6b12d73e49dc2bfad6f11caef04e8e42c7350d9..c2163315b9d71f90905e10f6288dcc61b5a724ce 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FccEquipmentIdPreferenceControllerTest.java @@ -20,8 +20,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +30,9 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class FccEquipmentIdPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java index f1e7f218631b5f36dfbc11b13fe116cf092204b0..343f28317ebd72db9a0504c5d6e6567dc1e43ca7 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/FeedbackPreferenceControllerTest.java @@ -21,8 +21,6 @@ import static org.mockito.Mockito.when; import android.app.Fragment; import android.content.Context; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,6 +31,9 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class FeedbackPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java index 9207e157201e214ca275cd6fb23b288be78c9920..f8fffbbfc620c456c1342868e375adef1cc82301 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/MyDeviceInfoFragmentTest.java @@ -29,7 +29,6 @@ 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; @@ -55,6 +54,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class}) public class MyDeviceInfoFragmentTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java index 565cdf0d866f9cae990d49b2d84139561ea67293..08baa30de1459681b92a584d6661aea9fc703cea 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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; @@ -41,6 +39,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class PhoneNumberPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java index fea58e288109f9445ab12abc8dc119778c870578..eb1ac541780a5899a847ee24c3f4d0b35a916b25 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/RegulatoryInfoPreferenceControllerTest.java @@ -24,8 +24,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +37,9 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class RegulatoryInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java index fed2cbef516e1afcb6b2a92d9845922e9cb0fc3c..ca77a87d316e3f5ed229ab8f7bb77e396ff5d30d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageDashboardFragmentTest.java @@ -27,7 +27,6 @@ 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; @@ -45,6 +44,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) public class StorageDashboardFragmentTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java index 34ce2e626e12732f8d419bb608895aceffbf9d1f..88ac8e9cbabb57ef707aebf78913c0e04e807d18 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java @@ -19,7 +19,6 @@ 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; @@ -31,6 +30,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class StorageItemPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java index c068ac76d5a1aad5fb4311ef511fc59906d4c27e..0dad2d14a39f83a203fe16928a74e4355e4a6df6 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoPreferenceControllerTest.java @@ -29,8 +29,6 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; @@ -45,6 +43,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ImeiInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java index 7757f442db1ec0f226e160668d971ca87cb8061e..1e836197af67d6f87499e4ddbe42054edfcbf160 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/CopyrightPreferenceControllerTest.java @@ -27,8 +27,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class CopyrightPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java index 5451c508bbb36cceee153eac59f16edfc85ca096..16af0f38c2cc16c97a2fd3b77e9626b76acc8fce 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/LicensePreferenceControllerTest.java @@ -27,8 +27,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LicensePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java index e9fb0abc2fa64bca507b2ad0a7f7bb630fab25bd..202f72b892cde58e235447d01e01402370e61af4 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/TermsPreferenceControllerTest.java @@ -27,8 +27,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class TermsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java index d7d15683cc5516477bf346b392e48c957049866c..65b671626da421ab0af2363a7477cd0024aba7be 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/legal/WebViewLicensePreferenceControllerTest.java @@ -27,8 +27,6 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WebViewLicensePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index f612e55bb8a0ea3df715ee2e2f82644584e2fcfd..606fe075c08e584650db630f73961429496b71f3 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -54,7 +54,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; @@ -80,6 +79,8 @@ import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPackageManager; import org.robolectric.util.ReflectionHelpers; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) public class SimStatusDialogControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java index 8ccce3a2e02a6e0a361f1df0e871e74e461f1e1e..0d1fef0a69b789c4177307e6acadf44e3dbfe419 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusPreferenceControllerTest.java @@ -27,8 +27,6 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.telephony.TelephonyManager; import com.android.settings.R; @@ -43,6 +41,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SimStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index 55e631a93ad929c55f9304b1ffc6bf123f6fdf6d..92e7d7cad568025e0ff4abe52e881cceb35526ac 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -31,8 +31,6 @@ import android.content.ContentResolver; import android.content.Context; import android.os.SystemProperties; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.os.RoSystemProperties; @@ -52,6 +50,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AutomaticStorageManagementSwitchPreferenceControllerTest { 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..cde850a337c52aa57f9ad0db2ae4cf17e5423406 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java @@ -27,9 +27,6 @@ import android.content.Context; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceScreen; import android.util.SparseArray; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -48,6 +45,10 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SecondaryUserControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java index c8ed42e342c591d2561f4548a4b9a824ff1fbf1a..44415bdc4e75c900054badb4387ea745b5e62c2c 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java @@ -16,7 +16,8 @@ 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.anyInt; @@ -37,7 +38,6 @@ 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; @@ -65,6 +65,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class StorageItemPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java index c36af1b66d357a9e8a01c4e622d8f2a439a009e0..df43c04793bc59530f08192be405ba54ba3e6cf5 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceControllerTest.java @@ -28,7 +28,6 @@ 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; @@ -53,6 +52,8 @@ import org.robolectric.annotation.Config; import java.io.File; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.class, diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java index 17ac6a98a052385456c8b5154a98fccb1d12cf6e..8595c5426433f0376f981471913f9a1d287680ab 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java @@ -27,8 +27,6 @@ import android.content.Context; import android.content.Intent; import android.content.pm.UserInfo; import android.graphics.drawable.Drawable; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.SparseArray; import com.android.settings.SettingsActivity; @@ -46,6 +44,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class UserProfileControllerTest { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java index 7a19fdefa50cd4c572276f840c94b65556d18af0..57de339ea1ae0b1deb2f34cdeaf959222aee9929 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,6 @@ 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 +11,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/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java index 42d24f8e351ecfc32275d99c71049d5a7daf71d6..2bff3b2485cb78198390af5760703967b575d79f 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.display; 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/display/AmbientDisplayNotificationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java index 77390d34738318f75c6886f62aca6175b8039185..b71974e75400272e65a8e4cb7fd494276f050b83 100644 --- a/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayNotificationsPreferenceControllerTest.java @@ -29,7 +29,6 @@ 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; import com.android.settings.search.InlinePayload; @@ -47,6 +46,8 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowSecureSettings.class) public class AmbientDisplayNotificationsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 5a31e3b4942dddc047036b73a92c94988b409f63..791922eaae2e7273a1557c2425832a9e74b323fb 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -26,7 +26,6 @@ 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; import com.android.settings.core.BasePreferenceController; @@ -45,6 +44,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowSystemSettings.class) public class AutoRotatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java index b758531fb4998ddb4de74ef9ccb9ab716cd9e9a1..36190e8facbd1c4f8eeeed4104e382c5ed3482ec 100644 --- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java @@ -29,8 +29,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +42,9 @@ import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowContentResolver; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BrightnessLevelPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java index 40007759b10b8edfa5be251c729fac0e3bac4994..859bf33b4fb3aa5c8c3b1cac729b3864b3b84260 100644 --- a/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/display/ColorModePreferenceFragmentTest.java @@ -26,8 +26,6 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.app.ColorDisplayController; import com.android.internal.logging.nano.MetricsProto; @@ -49,6 +47,9 @@ import org.robolectric.util.ReflectionHelpers; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class ColorModePreferenceFragmentTest { diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java index a4b0e54362f3359f2d81add5108f22a860cfdb74..1a671402974e0d182174cf29428428beaa518751 100644 --- a/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/NightDisplayActivationPreferenceControllerTest.java @@ -15,20 +15,18 @@ package com.android.settings.display; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings.Secure; -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; @@ -37,6 +35,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class NightDisplayActivationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/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..db811e08c93d69e22739596ed67341fd5b718897 100644 --- a/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/ShowOperatorNamePreferenceControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,6 +32,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ShowOperatorNamePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java index a2e669f4601b40e4cbdfd78fb7ba33bc8c3d5222..e30c14195ec3328d1d03bc3a39981f27cfdf2975 100644 --- a/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SystemUiThemePreferenceControllerTest.java @@ -17,9 +17,7 @@ package com.android.settings.display; import static android.provider.Settings.Secure.THEME_MODE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java index 8aea99004815a97370948916f709fe391ea53002..2e547216dabb4e276867d7ce2882ef451c09c426 100644 --- a/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/StartNowPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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; @@ -39,6 +38,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class StartNowPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java index d6e2e10b567b36302778a33a00d9114341b1a70f..96b0c83a1d3d57a500ce6bfbedca2b43b456c282 100644 --- a/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/dream/WhenToDreamPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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; import com.android.settingslib.dream.DreamBackend; @@ -35,6 +34,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class WhenToDreamPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java index 8914b53daa1c3c39922c3f993a921ed57adfac90..5321c1000ea66213bb963d0d548e2361d31d9bbb 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java @@ -32,9 +32,9 @@ import android.view.ViewGroup; import android.widget.FrameLayout; import android.widget.TextView; -import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.R; import com.android.settings.Settings; +import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd; import com.android.settings.testutils.CustomActivity; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowActivity; diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java index fa9702b9167047ea0e8db20892f1ebb8d079b206..33213d4ad98ef5d32e38461afe33f0de0bc883af 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerTestBase.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import android.text.format.DateUtils; import com.android.settings.R; @@ -36,6 +35,8 @@ import org.mockito.MockitoAnnotations; import java.util.Date; import java.util.GregorianCalendar; +import androidx.preference.Preference; + /** * Common base for testing subclasses of {@link AdminActionPreferenceControllerBase}. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java index 287d33458d8c39196310c64287c8eb51a1bb948f..d76fc91bd8b5cf66775c1739b814a3b1f45072a5 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java @@ -23,7 +23,6 @@ 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; import com.android.settings.applications.ApplicationFeatureProvider; @@ -37,6 +36,8 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import androidx.preference.Preference; + /** * Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java index b18bf1c6ad5aedd4250ddf01384f555757449351..574a050f81f92501d4a93a8a5c860b46f7d4a6b0 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -33,6 +32,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public final class AlwaysOnVpnCurrentUserPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java index e1a992621ce7f0276126214336e2becd899fc526..eb45aa7f1c2bd686b7156be04d89c021be82e82e 100644 --- a/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/AlwaysOnVpnManagedProfilePreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +31,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AlwaysOnVpnManagedProfilePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 18797934baa03985c1ff5b2521511a250b4bedcc..2684204294380be66effbaa7404e89e83516c3eb 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.pm.UserInfo; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ApplicationListFragmentTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java index d2b305aa0bbcb4256fba5b2a42c419bbbca5eb45..750b46b8af227e6e1ffd124e8bedb39d337c0b45 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java @@ -32,8 +32,6 @@ 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; import com.android.settings.SettingsPreferenceFragment; import com.android.settings.applications.ApplicationFeatureProvider; @@ -54,6 +52,9 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ApplicationListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java index 72207d1b497769254c4b22c481f4a6ae9faf9130..bd8c77cc6c74c57137e1c2dcba1a921d44fc0d4b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/BackupsEnabledPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -30,6 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class BackupsEnabledPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java index 2f31b28693a371d82a48ca6be420903aa3c5c890..2355e81492ada76344898aedb9451fcc875c7104 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceControllerTest.java @@ -19,8 +19,6 @@ package com.android.settings.enterprise; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -28,6 +26,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class CaCertsCurrentUserPreferenceControllerTest extends CaCertsPreferenceControllerTestBase { diff --git a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java index 485ed4685393b5a54c5aebbf50237d76248910a5..4ac28250992abef02fd170155daf3ec3a91340f6 100644 --- a/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/CaCertsPreferenceControllerTestBase.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -31,6 +30,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + /** * Base test class for testing {@link CaCertsPreferenceControllerBase}'s subclass. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java index d7d0abd09ae61285dc9d1a43b6cbe9452c036f5f..034293baf70288b536dbdc8be3f5c8d68f3774c1 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceControllerTest.java @@ -23,7 +23,6 @@ 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; import com.android.settings.applications.ApplicationFeatureProvider; @@ -39,6 +38,8 @@ import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseInstalledPackagesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java index 845f607c308bb14a1c3384eca3d44a45134069a0..0fcff3e1d48f822218748395b4bfe017303e1b43 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -33,6 +32,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class EnterprisePrivacyPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 6c5fed049105c16e82482b1ab8fb4b5b2d0e5cb4..70400dcea47ff638976f7cb81a37675e39fdee2f 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -21,8 +21,6 @@ import static org.mockito.Answers.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -38,6 +36,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListFragmentTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java index b54dc9ae4ee09b490f3a0be30f3f441456e42a74..c567f72fc960edae6036b779c4ecdde1f20a7958 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java @@ -32,9 +32,6 @@ 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; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -56,6 +53,10 @@ import org.robolectric.shadows.ShadowApplication; import java.util.Arrays; import java.util.Collections; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class EnterpriseSetDefaultAppsListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java index 442b56caab9896801641be2feda951f9623222ad..4f73ea79a0a0f9451bfa595d3ece5712d2f6e9a7 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java @@ -28,7 +28,6 @@ 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; import com.android.settings.applications.EnterpriseDefaultApps; @@ -47,6 +46,8 @@ import org.mockito.MockitoAnnotations; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public final class EnterpriseSetDefaultAppsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java index 0ee50cafe560c1d54f6af9e85d852c6d0bcff8b7..ba40752b34d2d0183d079d46f8d4a62ed1475ac2 100644 --- a/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java +++ b/tests/robotests/src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerTestBase.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -31,6 +30,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + /** * Common base for testing subclasses of {@link FailedPasswordWipePreferenceControllerBase}. */ diff --git a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java index 14ae7b4277a22b73ebec338e62ef0d43329c3bb0..0a50ed66784f5db87c9f11b1f26d2b51a867059a 100644 --- a/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/GlobalHttpProxyPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +31,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class GlobalHttpProxyPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java index c007d37375e41d4ae62fd611e0f3e22563d36d82..8fe73258b407cd4d37ccd7c94b7e29ba2033d560 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ImePreferenceControllerTest.java @@ -20,7 +20,6 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.FakeFeatureFactory; @@ -33,6 +32,8 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class ImePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java index 01a3c1e1769e6e83a528bde25e8054ac4b7b4cb3..f8984ab93d32f619c3c6c57779348fb8509b9c63 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintPreferenceTest.java @@ -20,7 +20,6 @@ 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; @@ -36,6 +35,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class FingerprintPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java index 8e94be01b471de8a8b0ab6a804c074733fa584b7..e01ed3cf00554c9e178781f1ce3ec423524f308e 100644 --- a/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fingerprint/FingerprintStatusPreferenceControllerTest.java @@ -29,7 +29,6 @@ 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; import com.android.settings.R; @@ -46,6 +45,8 @@ import org.robolectric.shadows.ShadowApplication; import java.util.Collections; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class FingerprintStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java index 5862ab3d28616d7549d31c002a27ff40c91ce273..e7cae8edc2c960b3f3dcb8c8d2569fdad83e9f57 100644 --- a/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/flashlight/FlashlightSliceBuilderTest.java @@ -18,20 +18,18 @@ package com.android.settings.flashlight; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import android.content.res.Resources; +import android.provider.Settings; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SliceTester; -import android.content.res.Resources; -import android.provider.Settings; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java index da4bddbb0a859d897779a5ccb3d2b73bdda1551e..b12b99a7b5e52bc6ad1c9d20f348a97e377caee8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java @@ -41,8 +41,6 @@ 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; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; @@ -77,6 +75,9 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowEntityHeaderController.class, ShadowActivityManager.class}) public class AdvancedPowerUsageDetailTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java index e8e688d84dc9f4da1d184cf09be872b55412e4d4..a6790fd6cd1a88787504affee1ceb0d86581645e 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/AutoRestrictionPreferenceControllerTest.java @@ -17,12 +17,10 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.FakeFeatureFactory; @@ -34,6 +32,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(RobolectricTestRunner.class) public class AutoRestrictionPreferenceControllerTest { private static final int ON = 1; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index a30ddf1cfb775e1e1b11bf45dcad967f380c279c..dc7c20521bdbf33b526942eae06257e57e1fb3c3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -22,7 +22,6 @@ 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; @@ -47,6 +46,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.preference.PreferenceGroup; + @RunWith(RobolectricTestRunner.class) public class BatteryAppListPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java index 4583dd1b3b4787f57684526490fdd684e0a9f7be..5bab7f4fc2214d934a2e735ff6a2071ed91067fb 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java @@ -16,7 +16,6 @@ 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; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index 0647887dcc7b82a508fecbb14f57ae237ccf4294..76b9ef0e42cba6a13fd2410d08244e658f054c1d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -29,14 +29,10 @@ import static org.mockito.Mockito.when; import static org.robolectric.Shadows.shadowOf; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.BatteryManager; -import androidx.preference.PreferenceFragment; import android.os.PowerManager; -import androidx.preference.PreferenceScreen; -import androidx.recyclerview.widget.RecyclerView; import android.widget.TextView; import com.android.settings.R; @@ -54,10 +50,15 @@ 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.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPowerManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceScreen; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { SettingsShadowResources.class, diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java index 66ea56c641b0430910cedff74a1fd2d06f788462..abf05af668d282aaf45f50e77976c1b16ca9448b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java @@ -25,8 +25,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.content.Intent; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.SettingsActivity; @@ -41,6 +39,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + @RunWith(RobolectricTestRunner.class) public class BatteryOptimizationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java index 5913d6b56f6e4b065b536f3bb9c5aa0901cacf5e..ad5537cf2e2e52e6c11839cea4e5818667266d3d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatterySaverControllerTest.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,7 +24,6 @@ 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; @@ -37,6 +35,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class BatterySaverControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java index ac0b25a9646d633e47e5c44e67d76f6be738540e..801a5e5eb784963aac4e9fce9fc71da553704f41 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java @@ -54,7 +54,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/PowerGaugePreferenceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java index caaf71e28f67bc961482da58b43ba36ed937b7df..ef7bc9851d5239248f16bf2df3376e40fa83d75d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerGaugePreferenceTest.java @@ -20,7 +20,6 @@ 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; @@ -35,6 +34,8 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class PowerGaugePreferenceTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java index ffa49d4f2537be3f6de741016f6e68f698d1adcc..af9566bf741e6bde7a174cbdfbddbeaf5c7395c3 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java @@ -16,7 +16,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -28,7 +27,6 @@ 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; @@ -46,6 +44,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class PowerUsageAdvancedTest { @Mock diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java index f003a7678c54c40dca4bfbaa3115925b49387645..0fb004c1f725da36464d7b51c545480e978a2b6b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetailsTest.java @@ -23,16 +23,12 @@ 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 androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceManager; import android.util.IconDrawableFactory; import com.android.settings.SettingsActivity; @@ -52,6 +48,11 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; + @RunWith(SettingsRobolectricTestRunner.class) public class PowerUsageAnomalyDetailsTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index 6d18109fb10c3e96538bf99ee8bdda48f7956369..2dc4198574da7a5a113f536473e52a9a370b4a51 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 07341a14656f8bdb66d669e16c8b3c0a3b3d5909..477981896891354a8720db57489ee753f1053451 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -16,7 +16,6 @@ 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; @@ -48,7 +47,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/RestrictedAppDetailsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java index c52377f172d2e6e1fbaa88d08bee9929e254fb31..321fda55e606a39112ecd96879a387a4e0c7d834 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/RestrictedAppDetailsTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -30,12 +29,7 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.UserHandle; -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 +43,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; @@ -61,6 +54,10 @@ import org.robolectric.util.FragmentTestUtil; import java.util.ArrayList; import java.util.List; +import androidx.preference.CheckBoxPreference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceManager; + @RunWith(SettingsRobolectricTestRunner.class) public class RestrictedAppDetailsTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java index 163b7c5c43d4d020a9c483856754ac527e091fe3..d7db33141aa9c36e9d8db969a50d72930326ccee 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/SmartBatteryPreferenceControllerTest.java @@ -17,13 +17,11 @@ package com.android.settings.fuelgauge; import static com.google.common.truth.Truth.assertThat; - 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; import com.android.settings.testutils.FakeFeatureFactory; @@ -35,6 +33,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(RobolectricTestRunner.class) public class SmartBatteryPreferenceControllerTest { 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..4cf7220bfffd71479c69a16fb6011d2728924cfa 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/anomaly/AnomalySummaryPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; @@ -42,6 +40,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AnomalySummaryPreferenceControllerTest { 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..aa677f4141e6ad5b197b89e560fe24b85c8db1f2 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySaverPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -33,6 +32,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class AutoBatterySaverPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java index e1cf196a9d913f3c34d2fdca78a984185e8761e0..abf2cdc7825b726f25693ccb20f83fa5f793ee06 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/AutoBatterySeekBarPreferenceControllerTest.java @@ -17,8 +17,6 @@ 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; @@ -34,6 +32,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class AutoBatterySeekBarPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java index f600d41352db8069c7019f406aa0f7638295e89e..4a2f5caa8ecb6758b955db2bd101f5475776c2a7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyCleanupJobServiceTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java index 35b6531a5b3a1542a17ec378e3a9a4eba5529c00..ecba92c2d25bd965809c67fa4323ea2aece36248 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyConfigJobServiceTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; - import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; @@ -34,7 +33,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 adee43331697694fe5800f4afcbf1e0b09ca1b25..1ebcc429ab62b64fb769f2d9ac772810bb0ca137 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java @@ -19,9 +19,7 @@ package com.android.settings.fuelgauge.batterytip; import static android.os.StatsDimensionsValue.FLOAT_VALUE_TYPE; import static android.os.StatsDimensionsValue.INT_VALUE_TYPE; import static android.os.StatsDimensionsValue.TUPLE_VALUE_TYPE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -52,14 +50,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..5b6e2713ffe491dbb3e693aff9c756adc4b968b1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceControllerTest.java @@ -16,14 +16,12 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.app.AppOpsManager; import android.content.Context; import android.provider.Settings; -import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +33,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class BatteryManagerPreferenceControllerTest { private static final int ON = 1; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java index a02bdc2aa522cb4c8234313d2318071098de123c..1ff663f9f90ef5e68421532b8ed2d7ea2547a04d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge.batterytip; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.robolectric.Shadows.shadowOf; 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..7e9ffeb3d8d591d202f91411850da88f928d50d4 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -17,11 +17,8 @@ package com.android.settings.fuelgauge.batterytip; import static com.android.settings.fuelgauge.batterytip.tips.BatteryTip.TipType .SMART_BATTERY_MANAGER; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -29,11 +26,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -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; @@ -56,6 +48,12 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BatteryTipPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java index 8c0be96d26bc67843d0d42fb028060fe15426131..5be86b030af094bce70b2eee89e7bba274127edc 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java @@ -17,22 +17,17 @@ package com.android.settings.gestures; import static android.provider.Settings.Secure.CAMERA_DOUBLE_TAP_POWER_GESTURE_DISABLED; - import static com.android.settings.gestures.DoubleTapPowerPreferenceController.OFF; import static com.android.settings.gestures.DoubleTapPowerPreferenceController.ON; import static com.android.settings.gestures.DoubleTapPowerPreferenceController.isSuggestionComplete; - import static com.google.common.truth.Truth.assertThat; -import 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 3d25ac724d48db8e74a36e9ebb28a0d8ea418627..4f89dbc61b386f7d3d81ba302f9f536e67192a0e 100644 --- a/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.gestures; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; 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/GesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java index 493e643f49601de102f999d0d888bc211509ac83..61ac5adad48f46a0508e57db81f5b3f8103e51b2 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturePreferenceControllerTest.java @@ -17,9 +17,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,9 +25,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.VideoPreference; @@ -43,6 +37,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(SettingsRobolectricTestRunner.class) public class GesturePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/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..9d58693f303193fac43398dae4fdb4705f18e78a 100644 --- a/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/GesturesSettingsPreferenceControllerTest.java @@ -25,7 +25,6 @@ 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; import com.android.settings.testutils.FakeFeatureFactory; @@ -46,6 +45,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class GesturesSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java index f609373aa79a24b195abf1d27d730ec863c8d8df..236c98756dfeb6f1c82134313173fedbc63391f3 100644 --- a/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PickupGesturePreferenceControllerTest.java @@ -19,7 +19,6 @@ package com.android.settings.gestures; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING; 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; diff --git a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java index bffc847a3b740b55cefb99c6bdcd88bd559a5ba6..a114719427ca1c0b2a195bafd2d88ca59b5158e4 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingParentPreferenceControllerTest.java @@ -20,14 +20,9 @@ import static android.provider.Settings.Secure.VOLUME_HUSH_GESTURE; import static android.provider.Settings.Secure.VOLUME_HUSH_MUTE; import static android.provider.Settings.Secure.VOLUME_HUSH_OFF; import static android.provider.Settings.Secure.VOLUME_HUSH_VIBRATE; - import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE; - import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; -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/gestures/PreventRingingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java index 514bb58dc4d39f18184a097f7371615608a9dfb1..d0a804f6497f00d890bcd5181756f087a7f64b20 100644 --- a/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/PreventRingingPreferenceControllerTest.java @@ -19,32 +19,15 @@ 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 +36,9 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.RuntimeEnvironment; + +import androidx.preference.ListPreference; +import androidx.preference.Preference; @RunWith(SettingsRobolectricTestRunner.class) public class PreventRingingPreferenceControllerTest { 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/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index 99cd779efa5d16452a9c9509c871c2c7989add86..f2cf2e0f73fc7cfba767b8f01ac56b2b7bdc4cbc 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -29,8 +29,6 @@ import android.content.Context; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; import android.hardware.input.KeyboardLayout; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import android.view.InputDevice; import com.android.settings.core.BasePreferenceController; @@ -47,6 +45,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class KeyboardLayoutPickerControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 11b3c4bdff023573442e0fd07f7414ff73769055..fcd9c6e507e344b9919ca0863dd2cb23ce8090b9 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -22,7 +22,6 @@ 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; @@ -37,6 +36,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class SpellCheckerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java index f39d3e688ce9cc9eb0a169978cb46f9eff89e938..a2b6e876483f957f00f12d398df85f731a3b3a5e 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListControllerTest.java @@ -27,9 +27,6 @@ import android.database.Cursor; import android.database.MatrixCursor; import android.net.Uri; import android.provider.UserDictionary; -import androidx.preference.Preference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,6 +39,10 @@ import org.robolectric.shadows.ShadowContentResolver; import java.util.TreeSet; +import androidx.preference.Preference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class UserDictionaryListControllerTest { diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index 43e89ffe05cb99e76acfb88b0efa46b3571f14dc..9ae36a2d6ab09dd7c89694597be6be2cc4a1221f 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -17,7 +17,6 @@ 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; @@ -30,9 +29,6 @@ import android.content.pm.PackageManager; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; -import androidx.core.text.BidiFormatter; -import androidx.preference.Preference; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,6 +43,9 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; +import androidx.core.text.BidiFormatter; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class VirtualKeyboardPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 9e18e06d2203646edbe2e1b2d53fee21071d7f3b..c39dc197a302d08889833526034d39ca0b892421 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -27,7 +27,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; @@ -59,6 +58,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.lifecycle.LifecycleObserver; + @RunWith(SettingsRobolectricTestRunner.class) public class LanguageAndInputSettingsTest { diff --git a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java index 8b7e8a6db27a5fa1ad4fc9ba85a7d031e8ea3d05..5506b9941d0741084a4fca6baacc6661385b3971 100644 --- a/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/PhoneLanguagePreferenceControllerTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.AssetManager; -import androidx.preference.Preference; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,8 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class PhoneLanguagePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java index 1b07f404e5170a7a1fff2fa9300a9c8277c99c81..cffe9213fb443c47c472a166acd62017669ee175 100644 --- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java @@ -24,8 +24,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +38,9 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class TtsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java index c20a83e8c6b27edb57bfe707a119baeafdf3a8c7..0019f4d038e870fa23797abce5fdc6ca708cc9a1 100644 --- a/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/language/UserDictionaryPreferenceControllerTest.java @@ -19,7 +19,6 @@ 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; import com.android.settings.inputmethod.UserDictionarySettings; @@ -36,6 +35,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.TreeSet; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class UserDictionaryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java index 0e5a9f6ad7112c83b2d324aaec4b015e319b787b..908393ee078c5733aff963df33913330bb69b094 100644 --- a/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/BluetoothScanningPreferenceControllerTest.java @@ -22,7 +22,6 @@ 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; @@ -33,6 +32,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BluetoothScanningPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/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..c9878bf715f62299806d787191de122cabf858a6 100644 --- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java @@ -30,7 +30,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; @@ -58,6 +57,8 @@ import org.robolectric.annotation.Implements; import java.util.ArrayList; import java.util.List; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowSecureSettings.class, diff --git a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java index 727e9a7e9bd8af76a600ac0940f238aad8c7310e..9991c3d90275b357293f880ac7984d38a639b20a 100644 --- a/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationFooterPreferenceControllerTest.java @@ -25,7 +25,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,8 +36,6 @@ import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.location.LocationManager; import android.os.Bundle; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -54,6 +51,10 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; + @RunWith(SettingsRobolectricTestRunner.class) public class LocationFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java index 92fbeb9bf99c911668928b6a88995fb62f09bf4c..80be34bfc67b981fc1a8955383aa645a9c239a5b 100644 --- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java @@ -24,13 +24,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.content.pm.UserInfo; import android.os.UserHandle; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,6 +47,9 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LocationForWorkPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java index e96dd2fe96b3ab91894295ae757c062838ab6e74..db8be8591de03bb4cc75f25270b2f71169b60d47 100644 --- a/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationPreferenceControllerTest.java @@ -23,7 +23,6 @@ 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,8 +31,6 @@ import android.content.IntentFilter; import android.location.LocationManager; import android.provider.Settings; import android.provider.Settings.Secure; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.search.InlineListPayload; @@ -52,6 +49,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LocationPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java index a6059a9e8c2842f6004b5e1696ef12e4527a5f6c..ba5decceb70fe49318d095f69a5161da41e824dd 100644 --- a/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationServicePreferenceControllerTest.java @@ -16,7 +16,6 @@ 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; diff --git a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java index 2f51470b9879e4fbd3dc216852f213c39bf1f26e..18ef0079741dbd5a9c9888ab09e3450ac8bcbc57 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSliceBuilderTest.java @@ -1,7 +1,6 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java index bd36cfaebcca429875ca6a98e450df6d2a3f47b5..6f10c8565def53637bd12805f165ff58c393b797 100644 --- a/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationSwitchBarControllerTest.java @@ -22,7 +22,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.provider.Settings; @@ -40,6 +39,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) public class LocationSwitchBarControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java index 9a69ad76a10ec0f590580446c9114d71c2a85e05..723659ae9f16fc85183a15cdf8565e23336d2123 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestPreferenceControllerTest.java @@ -27,14 +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.content.Context; import android.content.Intent; import android.provider.Settings; -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 +39,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 +51,14 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import java.util.ArrayList; +import java.util.List; + +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java index 1614a6cc808ad23ab06aac51fe8a6be316d1abd0..0cb7e7397f65842a1efa947b1e96f011035f1798 100644 --- a/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/RecentLocationRequestSeeAllPreferenceControllerTest.java @@ -24,11 +24,8 @@ 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.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.AppPreference; @@ -46,6 +43,10 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.Collections; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + /** Unit tests for {@link RecentLocationRequestSeeAllPreferenceController} */ @RunWith(SettingsRobolectricTestRunner.class) public class RecentLocationRequestSeeAllPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index 6279adfc78308270e48a2383752c3d4136a484a3..d0a3240fee7404d8ffa264d4cd138388bd981ae4 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -22,7 +22,6 @@ 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; @@ -33,6 +32,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiScanningPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java index 625a68bef851ee028cc6e55b35e9de70b1805615..9c719cd8153091a1a92dae1abb512834cdc8d5ea 100644 --- a/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/mobilenetwork/Enhanced4gLteSliceHelperTest.java @@ -19,9 +19,7 @@ package com.android.settings.mobilenetwork; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -34,14 +32,6 @@ import android.content.Intent; import android.content.res.Resources; import android.telephony.CarrierConfigManager; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.SliceLiveData; - import com.android.ims.ImsManager; import com.android.settings.R; import com.android.settings.slices.SettingsSliceProvider; @@ -60,6 +50,14 @@ import org.robolectric.RuntimeEnvironment; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.SliceLiveData; + @RunWith(SettingsRobolectricTestRunner.class) public class Enhanced4gLteSliceHelperTest { diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java index 4eaffbbe0297e540711ecc421a6b357d1f6a23eb..2d8514126e9d3f46fe685b92707ba34d7738a2fa 100644 --- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java @@ -30,8 +30,8 @@ import android.provider.SettingsSlicesContract; 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 203ae1b5404e17e998b1de14a296cbde0489fb96..c833ec6c02ce3ba53fcf424e58bebcc97c3fad1b 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -17,7 +17,6 @@ package com.android.settings.network; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -32,10 +31,6 @@ 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; @@ -55,6 +50,11 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import androidx.preference.EditTextPreference; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ApnEditorTest { diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 11eea6dc21da3bd1547119b2d55dd9fb4ecd9164..2c15a6dd08858c1189f4321e8f31fb1d96333070 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -25,14 +25,11 @@ 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; @@ -51,6 +48,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowConnectivityManager.class, diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index f6e40245177594929dc54a13767aad2f59174780..728985143ec783f2d0210f2c1ef0e9981c738d3e 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -25,7 +25,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +39,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.Collections; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class NetworkScorerPickerPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index 8a47a80c2718f2dcb4045cdd7fb62d91605ace7d..e405891d5b0d4bc9b20dd61dbc88284f322f52e1 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -28,8 +28,6 @@ import android.content.ComponentName; import android.content.Context; import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,6 +45,9 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class NetworkScorerPickerTest { diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java index 72f36c66989fc6c047075f3acd3e9e8aac91faeb..1d3a65e79b4b89aa15e0115edba2ad8f945b8da6 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java @@ -22,13 +22,10 @@ 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 +37,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..47354c747ea077b4cbad86de7f00874ecef48ef2 100644 --- a/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/PrivateDnsPreferenceControllerTest.java @@ -16,17 +16,16 @@ 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,23 +33,18 @@ 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.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -66,7 +60,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; @@ -74,6 +67,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class PrivateDnsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java index 5bf675e91b0c8781d41f08f0be875b62d979800f..c1cd8fbc0532240a23cef3c41586d3fca2f66567 100644 --- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java @@ -34,7 +34,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,6 +48,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.atomic.AtomicReference; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class TetherPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java index 6d0dd280c8b3c4970f0072995f1c3bf0f9376aff..dc5aa9af9b98b36371aad279d009cf22445f210d 100644 --- a/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/VpnPreferenceControllerTest.java @@ -16,9 +16,9 @@ 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 +26,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; @@ -39,9 +38,6 @@ import com.android.internal.net.VpnConfig; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -50,6 +46,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowServiceManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class VpnPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java index c5e38a6fe44087d8e5243250d76fedf147c96d6a..6bc4d3042bf0b8e0abb5444e2e7be0ff9ab2a070 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcAirplaneModeObserverTest.java @@ -22,9 +22,7 @@ import android.content.ContentResolver; import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; - import android.provider.Settings.Global; -import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowNfcAdapter; @@ -37,6 +35,8 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = {ShadowNfcAdapter.class}) public class NfcAirplaneModeObserverTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java index a10c27a874bb1af1d4e2e554d0bb6f3c087288bf..1fc63cf24a222bbf7e13c853d0d32bb24766c52a 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcEnablerTest.java @@ -17,7 +17,6 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -25,7 +24,6 @@ import android.content.ContentResolver; import android.content.Context; import android.nfc.NfcAdapter; import android.provider.Settings; -import androidx.preference.SwitchPreference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class NfcEnablerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java index 758f72c09989aac6e4b8a6f0166ff8c2ec940e88..990900c418057e94dc825a1e8f31eec098bd8459 100644 --- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java @@ -27,9 +27,6 @@ import android.nfc.NfcManager; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.PreferenceScreen; -import androidx.preference.SwitchPreference; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -43,6 +40,9 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class NfcPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java index b85bddad55e249b46f0dc4561974c698a557fa07..2700779f71f0e21dab5549f877682037659bd9a5 100644 --- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java +++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java @@ -18,7 +18,6 @@ package com.android.settings.nfc; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java index 2f383fe3c606e683ed6138f3d7c032301c8425f1..8cb22b3e7f5a674a154917fe123ff8ddd5ae411f 100644 --- a/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceControllerTest.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import com.android.settings.accounts.AccountRestrictionHelper; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +39,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AdjustVolumeRestrictedPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java index d89897282f2667ebe0447da2e61bfd180df5935b..2c7c4900677d5ef62b96ca2aeb0057e7aae034ab 100644 --- a/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AllowSoundPreferenceControllerTest.java @@ -35,8 +35,6 @@ 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; @@ -51,6 +49,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AllowSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java index 84407eb2acc7a7da8d7ef79d3926f8a3d704e336..9f411b1608079a3a82d13ff71a14abe3a239bc46 100644 --- a/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/AppLinkPreferenceControllerTest.java @@ -31,7 +31,6 @@ 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; @@ -43,6 +42,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class AppLinkPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java index 96dbd623a7890cf38c9c4342bbfec831903a240a..17a67140d83df92ad47f1f673cd209ea21a647ea 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgePreferenceControllerTest.java @@ -37,8 +37,6 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; @@ -53,6 +51,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class BadgePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java index 68991246ae10915e064763aaaf59073d3b291bd8..df2d23a283dbac8dc5c108a8f21af1f985ab0162 100644 --- a/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BadgingNotificationPreferenceControllerTest.java @@ -17,10 +17,8 @@ package com.android.settings.notification; import static android.provider.Settings.Secure.NOTIFICATION_BADGING; - import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF; 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; @@ -29,9 +27,6 @@ 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; import com.android.settings.search.InlinePayload; import com.android.settings.search.InlineSwitchPayload; @@ -47,6 +42,10 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(RobolectricTestRunner.class) public class BadgingNotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java index f2e50e9f6fc84363ccc89f4a68666456ee869951..ee01c8dc85e8c34a4d0737168d000f09a708346b 100644 --- a/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/BootSoundPreferenceControllerTest.java @@ -22,8 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.SystemProperties; -import androidx.preference.SwitchPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +33,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowSystemProperties; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class BootSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java index f20409a6abde98629c5e4d9108584af5f7fc9487..61e5287391caac4e15860d82dd578cdf65c90423 100644 --- a/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/CallVolumePreferenceControllerTest.java @@ -18,10 +18,7 @@ package com.android.settings.notification; import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; - - import static org.mockito.Mockito.when; import android.content.Context; diff --git a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java index 894ec07a8d5b4069f3433a70b9a52e8e08b03a37..3a3320118cb3fc9729cb46effed9f8ee84dcbe95 100644 --- a/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ChargingSoundPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +36,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ChargingSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java index d3463ce770b63cdf2b292f74d683bf66e2f37669..f97172e3b7ba16d0f3ec8d6aeb7a07d0d4862961 100644 --- a/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/ConfigureNotificationSettingsTest.java @@ -24,9 +24,7 @@ import static com.android.settings.notification.ConfigureNotificationSettings import static com.android.settings.notification.ConfigureNotificationSettings.KEY_SWIPE_DOWN; import static com.android.settings.notification.ConfigureNotificationSettings .SUMMARY_PROVIDER_FACTORY; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java index 5f3a616a2732f98c86311e224ab3804c74c9af60..5aecadc4ae02d898ff9d85614d18bbaac53a254c 100644 --- a/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DeletedChannelsPreferenceControllerTest.java @@ -30,7 +30,6 @@ import android.app.NotificationChannelGroup; import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; -import androidx.preference.Preference; import org.junit.Before; import org.junit.Test; @@ -41,6 +40,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; + @RunWith(RobolectricTestRunner.class) public class DeletedChannelsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java index 8901a5df17c6ba3598a3f07015e2eee451425e2f..2d304cc67aae29c9207567723005b027805f82fa 100644 --- a/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DescriptionPreferenceControllerTest.java @@ -30,7 +30,6 @@ 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; @@ -42,6 +41,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class DescriptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java index 881a307c88c3494caadcb8a38aaf9f006e155356..390937464f7f3cea4348cdc8fc4efc8fdcd834ac 100644 --- a/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DialPadTonePreferenceControllerTest.java @@ -24,8 +24,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class DialPadTonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java index 9f90e2689617e0289fcba739bfeddcfb672190c2..1b26a769b705ea99250ad2ecc6755b1da37cf462 100644 --- a/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DndPreferenceControllerTest.java @@ -17,7 +17,6 @@ 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; @@ -35,13 +34,10 @@ 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; @@ -52,6 +48,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DndPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java index 74ace1dd76440ac13bc895cbfd1c2926e911461a..34e824f7b392cb123a4950c8e318fc4db20e1974 100644 --- a/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockAudioMediaPreferenceControllerTest.java @@ -26,8 +26,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +36,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.DropDownPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class DockAudioMediaPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java index 3afb343f9063c3a91235a72da6ef5f126e294ce7..1a3c044bdaad33a1f7f6324b96306572646affa5 100644 --- a/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/DockingSoundPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class DockingSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java index 0dba467779b558cf2b2deca632b5747afdb225c3..4839ccb0e5ee9a7f8d672cb3d222e1d56cc41a7c 100644 --- a/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/EmergencyTonePreferenceControllerTest.java @@ -24,8 +24,6 @@ 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; import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.DropDownPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class EmergencyTonePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java index 26f516508bca284cb213473e6fdeca68710c0df8..0c9c6bec11d6248b222320c83cbecc9bd13a43c8 100644 --- a/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/HeaderPreferenceControllerTest.java @@ -31,7 +31,6 @@ 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 com.android.settings.applications.LayoutPreference; @@ -44,6 +43,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.PreferenceFragment; + @RunWith(SettingsRobolectricTestRunner.class) public class HeaderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java index 5557cfd6dfd60cbdad1f5c12ad0478a3ad03708f..bb7b05f7f581a14c682dd1c60a29d9b6b9c2d2a4 100644 --- a/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ImportancePreferenceControllerTest.java @@ -34,8 +34,6 @@ 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 android.text.TextUtils; import com.android.settings.RestrictedListPreference; @@ -51,6 +49,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ImportancePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java index 02b85e11cae8245332848be14d3958434b9042d6..c9d6530a7a695e8ff487a2edb1794ef200a21cdd 100644 --- a/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/LightsPreferenceControllerTest.java @@ -36,8 +36,6 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.SettingsShadowResources; @@ -54,6 +52,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class LightsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java index 0d493150f3cc6bd80eec3ca884c2226ffc82f513..bd83703646024eb3f7e1533d4edf4735a01a15bb 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationAppPreferenceTest.java @@ -21,8 +21,6 @@ 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; @@ -37,6 +35,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class NotificationAppPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java index 0f5f44dbe6d96f712b0e9714c74e7e8504564015..9da6d727a1fa08090fc36ba53655c2da24a5f985 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationBackendTest.java @@ -17,17 +17,11 @@ package com.android.settings.notification; import static com.google.common.truth.Truth.assertThat; - import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.when; - import android.app.usage.UsageEvents; import android.os.Parcel; @@ -39,7 +33,6 @@ import org.junit.runner.RunWith; import java.util.ArrayList; import java.util.List; -import java.util.Map; @RunWith(SettingsRobolectricTestRunner.class) public class NotificationBackendTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java index 38790b3e32a4f0de52708867e29bdf8c7649c018..a245c808bf4fb0f214f30f445cb068af09c4aca9 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationPreferenceControllerTest.java @@ -37,7 +37,6 @@ 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; import com.android.settingslib.RestrictedLockUtils; @@ -50,6 +49,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class NotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java index e429f9a292831e85c2a344fffe233b3b1dc987b1..d8ef938e4239afd288093bae9ff6743b60451db3 100644 --- a/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/NotificationsOffPreferenceControllerTest.java @@ -27,7 +27,6 @@ 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; @@ -39,6 +38,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class NotificationsOffPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java index ccff0f53390e56f61dc4f306df23247c6b9c3627..71ca554931ed2017329bfb5dbfbae3ec85893298 100644 --- a/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/PulseNotificationPreferenceControllerTest.java @@ -26,9 +26,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.content.res.Resources; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import com.android.settings.core.BasePreferenceController; @@ -41,6 +38,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(RobolectricTestRunner.class) public class PulseNotificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java index 9dd077f092f850a0f7eac3f30a2d72ee7f27030d..4b5de03fd8cc16f1379ea462c0e7c169c37e1079 100644 --- a/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/RecentNotifyingAppsPreferenceControllerTest.java @@ -40,9 +40,6 @@ import android.content.pm.ResolveInfo; import android.os.UserHandle; import android.os.UserManager; import android.service.notification.NotifyingApp; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import android.text.TextUtils; import com.android.settings.R; @@ -65,6 +62,10 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class RecentNotifyingAppsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java index f3633d3a9e22837a3a9f28bc057aa3ca59191500..b32b095e14d304bf142466d64f6d9030d3be12c1 100644 --- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java +++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java @@ -4,9 +4,7 @@ import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTI import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS; import static android.provider.Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS; - import static com.google.common.truth.Truth.assertThat; - import static org.robolectric.Robolectric.buildActivity; import android.content.ContentResolver; diff --git a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java index c6b055b04b9898ed39e25c93b5c2ff064566dc28..6c4253f64d70ba310106bdf2127922b214fae2a0 100644 --- a/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java +++ b/tests/robotests/src/com/android/settings/notification/RingtonePreferenceControllerBaseTest.java @@ -23,7 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.media.RingtoneManager; -import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,6 +32,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class RingtonePreferenceControllerBaseTest { diff --git a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java index 4e91eafe2fe87538f07225cb1a1cb1f8eae1f22c..a5a057b8ba97d7e55768b4b9c9fc1086176206f8 100644 --- a/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ScreenLockSoundPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,6 +36,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ScreenLockSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java index 38e91a4c9a66944d9ba7a04c2daa82b9339389e9..860b25cdaec777c2f442c31ad3e4ba2e33c94c6f 100644 --- a/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SettingPrefControllerTest.java @@ -27,7 +27,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -43,6 +42,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SettingPrefControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java index b98a68fadf34432700b355505d3f5e83d7cf140c..cbf01b1347eb1fa7f9d2f6e7468c565d5bf92a8b 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundPreferenceControllerTest.java @@ -40,8 +40,6 @@ import android.content.Intent; import android.net.Uri; import android.os.UserManager; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.AttributeSet; import com.android.settings.SettingsPreferenceFragment; @@ -59,6 +57,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = SettingsShadowResources.class) public class SoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java index 4eef4b626fba15c973a4cda6fd8da469a40b8baa..3e0d0b419b5919b8aa8eb918e3141c3c0d6b3f0c 100644 --- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java +++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java @@ -26,8 +26,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/TouchSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java index 8dd8f2453ba21271cbb8a827b9564e6083f8e7f9..0286691e3cda26edfc0999fa52b66c1cd7542281 100644 --- a/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/TouchSoundPreferenceControllerTest.java @@ -26,8 +26,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +37,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class TouchSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java index c391c1344ba39ffb054330e1c8bd7647dcbc51e6..fcf3a70bf79dd5b2f806a2793b2debae8af27b1b 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateOnTouchPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -37,6 +35,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class VibrateOnTouchPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java index 82357d8f6bc3566ddb2a07a0eb83afb5124dfd3b..91ee47e64ad04fe7e5ae9062633bc64d408f98b3 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrateWhenRingPreferenceControllerTest.java @@ -17,12 +17,9 @@ package com.android.settings.notification; import static android.provider.Settings.System.VIBRATE_WHEN_RINGING; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -30,9 +27,6 @@ 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; import android.telephony.TelephonyManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,6 +40,10 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowContentResolver; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(SettingsRobolectricTestRunner.class) public class VibrateWhenRingPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java index ce908952a86c71c8f0218c5f431656abe3d69379..29b7049548e4da628d0274525e5339a3d6521fea 100644 --- a/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VibrationPreferenceControllerTest.java @@ -35,8 +35,6 @@ import android.app.NotificationManager; import android.content.Context; import android.os.UserManager; import android.os.Vibrator; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.RestrictedLockUtils; @@ -51,6 +49,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class VibrationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java index 7b9af3e9a346b73da4e460e8294e938a8ee1f136..d583d3710fdde317f873d5e7aff9502827bfb7e5 100644 --- a/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VolumeSeekBarPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -36,6 +34,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class VolumeSeekBarPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java index eb6adfc71e9f326940fbabca17924a3bd60928e4..76f2b14d64f3f95228cbded94aa97b0db590586a 100644 --- a/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/WorkSoundPreferenceControllerTest.java @@ -28,10 +28,6 @@ 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.PreferenceCategory; -import androidx.preference.PreferenceScreen; -import androidx.preference.TwoStatePreference; import android.telephony.TelephonyManager; import com.android.settings.DefaultRingtonePreference; @@ -45,6 +41,11 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.TwoStatePreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WorkSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java index 40dfc4105e7e3a433c467d70ab3b0728b74ee707..7f7be568ac521b8d7cf16771923efd09a457a535 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenCustomRadioButtonPreferenceTest.java @@ -17,29 +17,24 @@ 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.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 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; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenCustomRadioButtonPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java index 8c7c32608cb459b3096c918cd2f1ca5b20e7193d..1360605eb9fd5694c688b7413646cee785aed36e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenFooterPreferenceControllerTest.java @@ -25,16 +25,13 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,6 +46,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenFooterPreferenceControllerTest { private ZenFooterPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java index 4325594ebcf5d55234fe63913a7eec2e7ad20a19..e68359aa3a43aeb27ea0d0b30054ac9e89299fde 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAlarmsPreferenceControllerTest.java @@ -28,8 +28,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeAlarmsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java index 552361a57840781c74fa5c6ad17c397cfd258225..cf003a67a6a63eda8bc691ed6b6b484d67067b45 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeAutomaticRulesPreferenceControllerTest.java @@ -25,8 +25,6 @@ import android.app.Fragment; import android.app.NotificationManager; import android.content.Context; import android.provider.Settings; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -45,6 +43,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeAutomaticRulesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java index b3a4b90b09893e5660592ba29b0c5a6edc359743..b6cb3ee27dc42dbcd5760d2e26748dd5558a65a1 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorCallsPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -38,6 +37,8 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public final class ZenModeBehaviorCallsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java index 0bf82144260fc7f24560463c59b33b5e534ac7d4..79a3671649668f58c8766a8fa46ddd9908c64b18 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorFooterPreferenceControllerTest.java @@ -22,10 +22,7 @@ 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,8 +34,6 @@ import android.content.Context; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.ArrayMap; import com.android.settings.R; @@ -55,6 +50,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeBehaviorFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java index e30fc71eff153be7cf74fdc6c00aefcd01692f5c..15bc48aa5e069dfef4297d8baa20764b6f5f8d2d 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorMsgEventReminderPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -38,6 +37,8 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public final class ZenModeBehaviorMsgEventReminderPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java index d3fab8fdf26cfe9b41c9840a6d04f1a3e0c9b623..d4d214f5cab015f069c7150b3cd06dfba4818066 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeBehaviorSoundPreferenceControllerTest.java @@ -24,7 +24,6 @@ import static org.mockito.Mockito.when; import android.app.NotificationManager; import android.content.Context; -import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -38,6 +37,8 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public final class ZenModeBehaviorSoundPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java index 10bd641cfd14c8804cc2843f1cb8787e618b48ff..ab9b1cbf20205c9c1fbfc3f11fcca5b17421bf04 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeButtonPreferenceControllerTest.java @@ -30,8 +30,6 @@ 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; @@ -47,6 +45,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeButtonPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java index 8ecc9551feb2197127c06cac292c2ce89a37de18..9ff5acb4f828228d3ebdc30309d4092d1fc1bba0 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeCallsPreferenceControllerTest.java @@ -20,7 +20,6 @@ import static android.provider.Settings.Global.ZEN_MODE; import static android.provider.Settings.Global.ZEN_MODE_ALARMS; import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS; import static android.provider.Settings.Global.ZEN_MODE_NO_INTERRUPTIONS; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -29,8 +28,6 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,6 +42,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeCallsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java index c03e95b672e59604d5b1684636fc7c6a91c7f445..26e1d48ae44aed0ea84a7ff34dd9135f4822d89b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeDurationPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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 com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -38,10 +36,12 @@ 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; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeDurationPreferenceControllerTest { private ZenModeDurationPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java index c0f6768bc687d992037276ac8dc496e7fed6e971..36e61a42c2a2efe62d12ea9e370878686bcefba9 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeEventsPreferenceControllerTest.java @@ -28,8 +28,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeEventsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java index 870981468e431ccbbf4f05485d46adeda38aafe4..afdfcf3afa7edf53fd3f5ff23ad2050fb2231214 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMediaPreferenceControllerTest.java @@ -28,8 +28,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -44,6 +42,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeMediaPreferenceControllerTest { private ZenModeMediaPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java index dd4b408e525b31b3470fe31ae58adb65d4294ee4..c4aaa8c8e2249e74f3f1fc7b165c14f9d9ceee13 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeMessagesPreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.app.NotificationManager; import android.content.ContentResolver; import android.content.Context; import android.provider.Settings; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -44,6 +42,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeMessagesPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java index 2e7f35cbf59dc396b891c07733a16f8df5ede53b..b009c3692eecbac68cfe0697beb9a2e67c47e006 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRemindersPreferenceControllerTest.java @@ -28,8 +28,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeRemindersPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java index cb79d649f89010e0485c9163921350f0d1e40bb7..eeef37c16919ca48df35af540076d6050cecc51e 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java @@ -28,8 +28,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,6 +41,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeRepeatCallersPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java index fcf54ead81400ebb40afa05637b3f36e5ce0acf4..aba4a3da9298c7dddda9cadce3e80d95cf11dac6 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSettingsFooterPreferenceControllerTest.java @@ -36,8 +36,6 @@ import android.net.Uri; import android.provider.Settings; import android.service.notification.ZenModeConfig; import android.service.notification.ZenModeConfig.ZenRule; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import android.util.ArrayMap; import com.android.settings.notification.AbstractZenModePreferenceController.ZenModeConfigWrapper; @@ -53,6 +51,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSettingsFooterPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java index 4fe1b76cdf00092be11dc177618dcc73ec903f3e..8da0ba7b5e7cd9c3bd8ef1badda7da02505048c0 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSliceBuilderTest.java @@ -17,9 +17,7 @@ package com.android.settings.notification; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; @@ -43,7 +41,6 @@ import org.robolectric.annotation.Config; import java.util.List; -import androidx.core.graphics.drawable.IconCompat; import androidx.slice.Slice; import androidx.slice.SliceItem; import androidx.slice.SliceMetadata; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java index ad8e0de71932d118a9826f14598588b339152f43..5781c47f597c0ee1aa3a9dea405e14442b1aad39 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeStarredContactsPreferenceControllerTest.java @@ -18,32 +18,17 @@ package com.android.settings.notification; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; +import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.mockito.Mockito.doAnswer; -import org.mockito.stubbing.Answer; -import org.mockito.invocation.InvocationOnMock; import android.app.NotificationManager; import android.content.ComponentName; -import android.content.ContentResolver; import android.content.Context; import android.content.Intent; -import android.database.CharArrayBuffer; -import android.database.ContentObserver; import android.database.Cursor; -import android.database.DataSetObserver; -import android.net.Uri; -import android.os.Bundle; - -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -53,11 +38,16 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; -import java.util.ArrayList; + import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeStarredContactsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java index 54d6afec612bfbc56250bc9748edbad884fbcd7d..908f3bf1a28848500b07acae9cdc33c519074dcc 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeSystemPreferenceControllerTest.java @@ -20,9 +20,6 @@ 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 junit.framework.Assert.assertEquals; - import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -31,8 +28,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -42,11 +37,13 @@ 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; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeSystemPreferenceControllerTest { private ZenModeSystemPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java index 2fb747e4b88f48688f91da6ea74a085402e7ce31..45573a90a6ced10c58149a7ee105e324fd086ea5 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectPreferenceControllerTest.java @@ -20,11 +20,8 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_BADGE; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; - -import static org.junit.Assert.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 +33,11 @@ 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; @@ -52,6 +47,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectPreferenceControllerTest { private ZenModeVisEffectPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java index a20b7e16d14fdbf229d403997706ff37dcab6155..cca7fd541877b0565f9215bb9b96963ea34fffc2 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsAllPreferenceControllerTest.java @@ -25,28 +25,19 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; - import static com.android.internal.logging.nano.MetricsProto.MetricsEvent .ACTION_ZEN_SOUND_AND_VIS_EFFECTS; - import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.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; @@ -57,6 +48,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectsAllPreferenceControllerTest { private ZenModeVisEffectsAllPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java index 9f8e91ac7a414b6eea023e3cb7c88a712d12f0ff..ae9a7bb515620f204ed40a3a7d21a9013b6db686 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceControllerTest.java @@ -25,23 +25,14 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; - -import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -55,6 +46,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectsCustomPreferenceControllerTest { private ZenModeVisEffectsCustomPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java index fd22166563bd575703f4778087e2fea56b716877..09dd3a0b7c8bfba9a0f2bcf1de0fc75542a6a43b 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenModeVisEffectsNonePreferenceControllerTest.java @@ -25,27 +25,19 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR; - import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_ZEN_SOUND_ONLY; - import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.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; @@ -56,6 +48,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ZenModeVisEffectsNonePreferenceControllerTest { private ZenModeVisEffectsNonePreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java index 3ca9fdac779c40d8a5e6f80be5500cebdcab2d57..58468334c196ec4f4fbf0d4efc91c3701b2054e8 100644 --- a/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java +++ b/tests/robotests/src/com/android/settings/notification/ZenOnboardingActivityTest.java @@ -19,14 +19,11 @@ package com.android.settings.notification; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_ALARMS; import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS; import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON; - import static com.android.settings.notification.ZenOnboardingActivity.ALWAYS_SHOW_THRESHOLD; import static com.android.settings.notification.ZenOnboardingActivity .PREF_KEY_SUGGESTION_FIRST_DISPLAY_TIME; import static com.android.settings.notification.ZenOnboardingActivity.isSuggestionComplete; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java index c66373b669bd3bb6453e34e4d85c94774048fcd8..24a45daf913ca181e490a0daa3e160cb3b0ca351 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java +++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java @@ -21,8 +21,10 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.spy; import android.app.Activity; + import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; + import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java index 26bb17b2c5c3e97987e12c75ed3cf1dbfb6fe7f8..2db969e4ada20805760cc1e1f3ba6a24a4d41797 100644 --- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java +++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java @@ -17,7 +17,6 @@ package com.android.settings.password; 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/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java index 1b48da80c5135181528f54050d0a6c66fc0dc6ba..3828dbaae39317ba10841cde0b73e7b9d1daadd7 100644 --- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java @@ -24,7 +24,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.os.UserManager; import android.print.PrintJob; @@ -49,6 +48,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.List; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) public class PrintSettingsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexUpdateJobServiceTest.java index 1c02b99323d17d7e5f3038bab479b1ef056759a0..dc9472a392e0536b9c998818bc7604b61be02afe 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; @@ -37,16 +36,14 @@ 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; +import androidx.slice.SliceViewManager; @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexUpdateJobServiceTest { diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java index 7cea11f61a58e3a2ab2274602c8e70727e6b0c7b..971d4f59772c38cb0b11760b1b430aafa610cf53 100644 --- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java +++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java @@ -17,11 +17,8 @@ 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/indexing/IndexDataConverterTest.java b/tests/robotests/src/com/android/settings/search/indexing/IndexDataConverterTest.java index 620cb0c0ed9bd869d3a7f3cbdc98b5c1d87fec4a..24807d05a7fd3528d4c0d2251e622b85f599cd2d 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,9 @@ 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 +43,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/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java index 493c166b14ecb1dc1c456da0a80ecabc0459b781..661f4967d555f3f8120e56c4ddc02e731dadf4c3 100644 --- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java @@ -19,7 +19,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -31,6 +30,8 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowKeyStore.class) public class CredentialStoragePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 944f9fd4e60962806e0cbff63fc62dc88b116dfd..7097f21c8ff26531c2ae3ff1dc3f52ecf307f18d 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -16,13 +16,14 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +36,8 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.annotation.Config; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowLockPatternUtils.class) public class EncryptionStatusPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java index 728fda65ab266016eefca074092fdc94cc41e571..7dcd71cccc92ac5bdd62fecdf68fef8ecc149c82 100644 --- a/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockUnificationPreferenceControllerTest.java @@ -23,8 +23,6 @@ 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; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; @@ -39,6 +37,9 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class LockUnificationPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java index b222d2539c8d944c1da75bc9004a48eb5fa5d5c6..a87d9dbce856fac74587d8e5c66f0452fac9b690 100644 --- a/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/LockdownButtonPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,6 +34,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class LockdownButtonPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java index 5568553b7c9d243ff21baf66b9ceac506a4a6da8..05d76f1a749cd07f2a549fce062e5368b4529679 100644 --- a/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/OwnerInfoPreferenceControllerTest.java @@ -29,9 +29,6 @@ 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; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,6 +44,10 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceFragment; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class OwnerInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index b41ec461a08c4bdfd3d62a4d1e1fd733ac3188c7..9ef34d473ce49d3a7e85efc67c9906ee5cf8bc17 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -18,7 +18,6 @@ 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; @@ -33,6 +32,8 @@ import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowUserManager.class) public class RestrictedEncryptionPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java index e8906cba15e1a97d80b10204cea271b9cf485b9f..1773540dd4be451c58e08b1eb6a8c6f9f5c1b32a 100644 --- a/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ScreenPinningPreferenceControllerTest.java @@ -21,7 +21,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +33,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class ScreenPinningPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java index 5928587798de81337d27994e331fbcfa54be1702..f9573ef56325b42c587669895f0a232757619f29 100644 --- a/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/ShowPasswordPreferenceControllerTest.java @@ -24,8 +24,6 @@ import android.content.ContentResolver; import android.content.Context; import android.os.UserHandle; import android.provider.Settings; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.FakeFeatureFactory; @@ -39,6 +37,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class ShowPasswordPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java index 4a12c5a2397717cdc5635b545f424dacbba3756c..413932a42906555a4c699af1f4261d5d8f65aae6 100644 --- a/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/SimLockPreferenceControllerTest.java @@ -25,8 +25,6 @@ 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; @@ -46,6 +44,9 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SimLockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java index 1d65aed2015b92581a0dcea2696557188a1aa25c..1ee3fce6fb42d4557efc4fa8ddd49f54d82f3778 100644 --- a/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/VisiblePatternProfilePreferenceControllerTest.java @@ -26,7 +26,6 @@ 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; @@ -45,6 +44,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.shadows.ShadowApplication; +import androidx.lifecycle.LifecycleOwner; + @RunWith(SettingsRobolectricTestRunner.class) public class VisiblePatternProfilePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java index 0b5d29d9284313961ad6b3235424134758537a62..683599072816a6bca4c8c749a230cc571921d53d 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PatternVisiblePreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; -import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -34,6 +33,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class PatternVisiblePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java index c30c53ebb885b78f3957085f2b5e0e75a42ef36c..e3e25eaa58a9b9468ed99faf1243775f5610e361 100644 --- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.when; import android.app.admin.DevicePolicyManager; import android.content.Context; -import androidx.preference.SwitchPreference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -37,6 +36,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class PowerButtonInstantLockPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java index eedb2da4c07974bf538cc2121e70be412d2e7b3d..d6c4ce97331074bdb3c64010366c0fa2c076f140 100644 --- a/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.when; import android.content.Context; -import androidx.preference.Preference; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; @@ -40,6 +39,8 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; import java.util.Collections; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class ManageTrustAgentsPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java index 6d18449e5f89d6b3a516f57becb9f7eff4c4eade..d57834851f9f731cf5e731b4160cc62985af6352 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBroadcastReceiverTest.java @@ -18,8 +18,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 +38,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..ed33a80c94e02fc169c2706a11c84aabaf6c4f88 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java @@ -17,14 +17,12 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; 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; diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java index 674d6299a1e2205e5de11a02dbf657e679c503a2..66915ed83c83ffd7d36d5e94d2f2cd2d7a7caf43 100644 --- a/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java +++ b/tests/robotests/src/com/android/settings/slices/SliceDataConverterTest.java @@ -17,7 +17,6 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -33,10 +32,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..1f314731f03ec5a616bdacd3a23d79db4374e727 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -18,7 +18,6 @@ package com.android.settings.slices; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.spy; import android.content.ContentValues; @@ -27,11 +26,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 +39,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/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java index b823105dd02affdcc44d5c752a60230e979def1a..7a2db3e43e01aa5a340f5e740f28c3b30ffacbe3 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java @@ -17,7 +17,6 @@ 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 ebcf4c1634b23959e5e45f1b0584a0fccdecaaae..45a0367b325a3687ece6386b03b8de5cf31fef8f 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -25,30 +25,23 @@ import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO_HEADSET; import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID; import static android.media.AudioSystem.STREAM_MUSIC; - import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; 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 androidx.preference.ListPreference; -import androidx.preference.PreferenceManager; -import androidx.preference.PreferenceScreen; +import android.content.pm.PackageManager; import android.util.FeatureFlagUtils; import com.android.settings.R; @@ -80,6 +73,10 @@ import org.robolectric.shadows.ShadowPackageManager; import java.util.ArrayList; import java.util.List; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, diff --git a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java index 4e67143c084085a6d4c0a9deb89f77552b0b28e8..4a8f76b0c04e0a60b2ddea8f2e600848acca8893 100644 --- a/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/HandsFreeProfileOutputPreferenceControllerTest.java @@ -19,9 +19,7 @@ package com.android.settings.sound; import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_SCO; import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; - 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; @@ -34,9 +32,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -62,6 +57,10 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java index e1b930169809067721bdc3a0dbfedfebf79f66da..dfc3d6999178067796a8edf256a2e8e0eea94667 100644 --- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java @@ -21,9 +21,7 @@ import static android.media.AudioSystem.DEVICE_OUT_BLUETOOTH_A2DP; import static android.media.AudioSystem.DEVICE_OUT_HEARING_AID; import static android.media.AudioSystem.DEVICE_OUT_REMOTE_SUBMIX; import static android.media.AudioSystem.DEVICE_OUT_USB_HEADSET; - 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; @@ -36,9 +34,6 @@ 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; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -64,6 +59,10 @@ import org.robolectric.shadows.ShadowBluetoothDevice; import java.util.ArrayList; import java.util.List; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceManager; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowAudioManager.class, diff --git a/tests/robotests/src/com/android/settings/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/survey/SurveyMixinTest.java b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java index b44a719624f2a4916362e2f3ea1011125885bf66..36ecf5a394df6c1a6be65b368a46a2009570fbe7 100644 --- a/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java +++ b/tests/robotests/src/com/android/settings/survey/SurveyMixinTest.java @@ -12,7 +12,6 @@ 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; import com.android.settings.overlay.SurveyFeatureProvider; @@ -31,6 +30,8 @@ import org.robolectric.util.ReflectionHelpers; import java.util.ArrayList; import java.util.HashMap; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + @RunWith(SettingsRobolectricTestRunner.class) public class SurveyMixinTest { diff --git a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java index 0c26650798a0183ed0b7d8c5ef71830023a61959..b65b2e3cd79b5a47edf796ae1ff37973e195f407 100644 --- a/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java @@ -28,8 +28,6 @@ import android.os.Build; import android.os.Bundle; import android.os.SystemUpdateManager; import android.os.UserManager; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -49,6 +47,9 @@ import org.robolectric.shadows.ShadowUserManager; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class SystemUpdatePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java index 3803d75c0ca935fc5600c622983ed8665009d168..e85141c25105099f2d822670b776354d012de6ea 100644 --- a/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java +++ b/tests/robotests/src/com/android/settings/testutils/ResIdSubject.java @@ -17,15 +17,14 @@ package com.android.settings.testutils; import static com.google.common.truth.Truth.assertAbout; - import static org.robolectric.RuntimeEnvironment.application; -import androidx.annotation.Nullable; - import com.google.common.truth.ComparableSubject; import com.google.common.truth.FailureStrategy; import com.google.common.truth.SubjectFactory; +import androidx.annotation.Nullable; + /** * Custom subject for use with {@link com.google.common.truth.Truth}, to provide a more readable * error message, so that instead of "Not true that 2130706432 equals to 17170444", it will say diff --git a/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/testutils/SettingsRobolectricTestRunner.java index 0b29af58bad9f67a428568f069f513a3231166b2..98693e3e44a0c1ab53bcaa54a599d302534b47c6 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 e72168db973da918c79bf4e684d904235b9ad674..195e4d6a273145a2b037755ea1f1f2f5dd3378bc 100644 --- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java +++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java @@ -20,23 +20,22 @@ import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.Slice.SUBTYPE_COLOR; import static android.app.slice.SliceItem.FORMAT_INT; import static android.app.slice.SliceItem.FORMAT_TEXT; - -import static com.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 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.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 +44,6 @@ 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; - /** * 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..d0c3373965b3ab2ec355914b7bd965f3f0e2d91b 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java @@ -14,9 +14,6 @@ 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; @@ -40,6 +37,10 @@ import org.w3c.dom.Node; import java.util.List; import java.util.Map; +import androidx.annotation.ArrayRes; +import androidx.annotation.ColorRes; +import androidx.annotation.Nullable; + /** * Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot * handle because they are too new or private. diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/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..bacd1fbfd97d94570a3c23f09ba91f6300329c2a 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowAudioManager.java @@ -18,13 +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; import android.media.AudioDeviceCallback; diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java index 4ca894314a4f67542f21f71007f77831552aac1e..a17bdce8aa189192a1915fc4276184f7a2afd430 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBidiFormatter.java @@ -16,11 +16,11 @@ package com.android.settings.testutils.shadow; +import org.robolectric.annotation.Implements; + import androidx.core.text.BidiFormatter; import androidx.core.text.TextDirectionHeuristicCompat; -import org.robolectric.annotation.Implements; - @Implements(BidiFormatter.class) public class ShadowBidiFormatter { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java index 55c1c45982e6056b9632d64c22a90d6896b9ee5f..d9aaacc8e04458406de58e2da9260082f432d988 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowCardView.java @@ -17,12 +17,13 @@ package com.android.settings.testutils.shadow; import android.content.Context; -import androidx.cardview.widget.CardView; import android.util.AttributeSet; import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowFrameLayout; +import androidx.cardview.widget.CardView; + /** * Shadow for CardView to get around view not implemented error. */ diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java index 928779b5c05aff316c49a1ab1dd772ca20577d5b..7bfb1c55b8e827eb0b05f8419d6a66ca0f1c5749 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java @@ -16,20 +16,19 @@ 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 android.text.TextUtils; + 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..17129c287c8be83ff1da9b2ffd65f1e1c9d6dfd8 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java @@ -19,7 +19,6 @@ 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; import org.robolectric.annotation.Implementation; @@ -35,6 +34,8 @@ import java.util.List; import java.util.Map; import java.util.stream.IntStream; +import androidx.annotation.NonNull; + @Implements(FingerprintManager.class) public class ShadowFingerprintManager { diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/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..efa4626f76ff58d9b1120da770261f6d49044e92 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPermissionChecker.java @@ -18,8 +18,6 @@ package com.android.settings.testutils.shadow; import android.content.Context; import android.content.pm.PackageManager; -import androidx.annotation.NonNull; -import androidx.core.content.PermissionChecker; import android.text.TextUtils; import org.robolectric.annotation.Implementation; @@ -29,6 +27,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.core.content.PermissionChecker; + /** * This class provides shadow for API that is not supported in current roboletric */ diff --git a/tests/robotests/src/com/android/settings/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/AutoSyncDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java index 782e94d39761912728371349ecd3fcb78f32a664..2cef7516937b17cabb980e9a5f46e727cd17eced 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncDataPreferenceControllerTest.java @@ -25,9 +25,6 @@ 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 com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,6 +39,10 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class AutoSyncDataPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java index 6247feb16bac315337212d475c483198be08a93f..10fd7c49cc7da10cb70b0f1a8d3627e25544a422 100644 --- a/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AutoSyncPersonalDataPreferenceControllerTest.java @@ -24,8 +24,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +37,9 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class AutoSyncPersonalDataPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java index 488be7ab84fb1f71f6155bd39655e3e3efa51c79..c03215407d53d8181c0d8777d0f79b03c2227816 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java @@ -26,7 +26,6 @@ import android.app.Activity; import android.app.Fragment; import android.content.Context; import android.content.Intent; -import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -39,6 +38,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; + @RunWith(SettingsRobolectricTestRunner.class) public class WallpaperTypePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java index 6b4df47ea3ffc80915d35457cb70cc3e99dec53c..3c7c95951a5229aa5ee5f98ee9b0eb3a7e5cff20 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionBarShadowControllerTest.java @@ -26,8 +26,6 @@ import static org.mockito.Mockito.when; import android.app.ActionBar; import android.app.Activity; -import androidx.lifecycle.LifecycleOwner; -import androidx.recyclerview.widget.RecyclerView; import android.view.View; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -40,6 +38,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.lifecycle.LifecycleOwner; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) public class ActionBarShadowControllerTest { diff --git a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java index f34c60baa93248538c5593597f2edc2e96815dfc..a43f50006e39547f6871d276047256fdce249423 100644 --- a/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ActionButtonPreferenceTest.java @@ -24,7 +24,6 @@ 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; @@ -36,6 +35,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class ActionButtonPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java index 9ce63179ccfbf83fa88f2d6251d0b430ab912ea2..4f9100aa2a6a7daf0a5e096992baceca1556c6df 100644 --- a/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppPreferenceTest.java @@ -19,7 +19,6 @@ 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 com.android.settings.R; @@ -30,6 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class AppPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java index 6cb4f3d023425315d457dfcb2f73fe8aff18eb09..8bca41dff967ec0cc6ce927e00d31918c6e82bd5 100644 --- a/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/AppSwitchPreferenceTest.java @@ -19,7 +19,6 @@ 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 com.android.settings.R; @@ -30,6 +29,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class AppSwitchPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java index 90470f64a1dfd0e88ff2103a46605050af18e257..b5c3d733320605c9cd93699bd06382e97d79dd74 100644 --- a/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/DisabledCheckBoxPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -27,6 +26,7 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.view.LayoutInflater; import android.view.View; +import android.widget.LinearLayout; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -35,10 +35,9 @@ 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; +import androidx.preference.R; @RunWith(SettingsRobolectricTestRunner.class) public class DisabledCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java index 48e918d9de07571898c7583a547a391dd4cfe75a..618de6382e331480f4e7afc6c05f41faf97b95ef 100644 --- a/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/FixedLineSummaryPreferenceTest.java @@ -20,7 +20,6 @@ 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; @@ -35,6 +34,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class FixedLineSummaryPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index d952324a3033a1cf6bc1f1a2c19b79a3284a6c07..79854c50f100429935cdcce72d5a4b48a1c7e80c 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -29,10 +29,6 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -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; @@ -48,6 +44,11 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.util.ReflectionHelpers; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; + @RunWith(SettingsRobolectricTestRunner.class) public class HighlightablePreferenceGroupAdapterTest { diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java index b21090dacc9afcab42b8ae591bdfd24d1fc804fc..06fcc5854899af5b37a4cb4a97af07bb68a6a4fa 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java @@ -21,8 +21,6 @@ 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; @@ -36,6 +34,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class MasterCheckBoxPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java index f96519a4a1bb89552554f0f62f076e2ecc214d2d..062d1e4caf9b8ea408bf318012376ccf735bd74a 100644 --- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java @@ -21,8 +21,6 @@ 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; @@ -37,6 +35,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class MasterSwitchPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java index 29cc1796930e5c080f560336e77f6acc2fb98c19..3d415d458c290cd220822d2f55d65a6e22321b4f 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPickerFragmentTest.java @@ -25,7 +25,6 @@ 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; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -42,6 +41,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; import java.util.List; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class RadioButtonPickerFragmentTest { diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java index 80af1f92bff90585644d96e62ff8e91181258efd..0d887795a67263cad46be9a5619b5e9f147871f2 100644 --- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceTest.java @@ -18,12 +18,10 @@ 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 com.android.settings.R; @@ -34,6 +32,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class RadioButtonPreferenceTest { diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index f7c96ed559088145943556160addefe0e3cf8a1b..2e59b230e2bd8f7318606b2b16a4990f0a0f7b1c 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -19,7 +19,6 @@ 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; @@ -33,6 +32,8 @@ import org.robolectric.RuntimeEnvironment; import java.util.Locale; +import androidx.viewpager.widget.PagerAdapter; + @RunWith(SettingsRobolectricTestRunner.class) public class RtlCompatibleViewPagerTest { diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java index 818daecd26d8ba494669aff5877aaff3fca6b7a1..a7854122d814eef638ebe2aa0ecbb79691e37027 100644 --- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java +++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java @@ -25,8 +25,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/UpdatableListPreferenceDialogFragmentTest.java b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java index 57c9f6b51aad968dbb2e345fc8013f724a0a7648..bed2511cfbcd478059892e7c0896d2ca205d56f5 100644 --- a/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/widget/UpdatableListPreferenceDialogFragmentTest.java @@ -17,10 +17,11 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; import android.content.Context; import android.widget.ArrayAdapter; -import androidx.preference.ListPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.shadow.ShadowBluetoothUtils; @@ -34,7 +35,7 @@ import org.robolectric.annotation.Config; import java.util.ArrayList; -import static org.mockito.Mockito.spy; +import androidx.preference.ListPreference; @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowBluetoothUtils.class) diff --git a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java index 4e2ec7b2af1eb3955e8b79ed976755f1d54cab62..5b332825e3e72ea278234f0d38400865a8a6c540 100644 --- a/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/ValidatedEditTextPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Mockito.never; @@ -25,7 +24,6 @@ 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; @@ -40,7 +38,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; + +import androidx.preference.PreferenceViewHolder; @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..153a91b2656656f5071244a76322f21303ff32c7 100644 --- a/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java @@ -17,12 +17,10 @@ package com.android.settings.widget; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.when; import android.content.Context; import android.media.MediaPlayer; -import androidx.preference.PreferenceViewHolder; import android.view.LayoutInflater; import com.android.settings.R; @@ -35,6 +33,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class VideoPreferenceTest { private static final int VIDEO_WIDTH = 100; diff --git a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java index d49c019aeb66e15c6d90cc0f4f63cc2fcbb068c0..fdfebcd598f908f11a3275a8baffe03d681b3c12 100644 --- a/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java +++ b/tests/robotests/src/com/android/settings/wifi/AppStateChangeWifiStateBridgeTest.java @@ -18,8 +18,8 @@ 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/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java index 452fe0346da7d5719dd989d80a7c871c4af14e5d..16930c822783b12c89c57722ae0558582a114a40 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java index 5ec598a4a79e2138a10b34d884c54bfa2ae4302d..e07bcaf2d56da0065394979e2ef57cee1ea7c5f2 100644 --- a/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java +++ b/tests/robotests/src/com/android/settings/wifi/LinkablePreferenceTest.java @@ -19,7 +19,6 @@ 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; @@ -35,6 +34,8 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceViewHolder; + @RunWith(SettingsRobolectricTestRunner.class) public class LinkablePreferenceTest { diff --git a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java index de629d83eccad08bd278bb7abe0e7e78088d322f..7cd9b78b537c43e490a31a2bfeb3868d298a02f0 100644 --- a/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/NotifyOpenNetworkPreferenceControllerTest.java @@ -23,8 +23,6 @@ import static org.mockito.Mockito.verify; import android.content.Context; import android.provider.Settings; -import androidx.preference.SwitchPreference; -import androidx.preference.Preference; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -35,6 +33,9 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class NotifyOpenNetworkPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index bc99fc24acf1dec5b3a89c158209b8ba15f89aef..14611fac651669aeef64e7149d688f83bb4c89b4 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -35,8 +35,6 @@ 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 com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -58,6 +56,9 @@ import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class UseOpenWifiPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java index 75c9bb14a5e045bc3d225db406d0b17320ba09a9..c6ebafb9942dcdc53045d1e7034835e89f5de8cb 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiEnablerTest.java @@ -17,9 +17,7 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.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..3a8ced58bd38e90903ad2b05c512d84a54008cec 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiInfoPreferenceControllerTest.java @@ -24,15 +24,12 @@ 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.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -45,6 +42,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiInfoPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java index 57ecfd0c37ef3735faf4d996766b3c37fdf162af..f3919697a9300c0e75804db02f872e9c07e5878d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java @@ -17,7 +17,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.Matchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -31,8 +30,6 @@ 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; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -48,6 +45,9 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = ShadowRestrictedLockUtils.class) public class WifiMasterSwitchPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index 0c42c3485ed92a7042e1898ba0d9a4107e45cea0..65ca3e19241edef977a350b712f1169e18d8c32e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -16,7 +16,6 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java index b7618069a543d8a9a9493575446c2b0f5f12adba..0b1c4adc4ecba997e110128ba54055653eee4883 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSliceBuilderTest.java @@ -18,21 +18,19 @@ package com.android.settings.wifi; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import android.content.Context; +import android.content.Intent; +import android.content.res.Resources; +import android.net.wifi.WifiManager; 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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index 38118f58586067604a939ffc5e7eaef8b79bc147..308463b2bee29de08b9c89b3b5e9edfbf18476be 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -19,17 +19,13 @@ 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 com.android.settings.R; import com.android.settings.dashboard.DashboardFragment; @@ -44,6 +40,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiWakeupPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java index 6388297eaeb0ce3089481f1a4212006142eefea4..cdc8ecbfcf92343bc30fbfa4a0a151f68f13f741 100644 --- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java +++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java @@ -19,11 +19,7 @@ package com.android.settings.wifi.calling; import static android.app.slice.Slice.EXTRA_TOGGLE_STATE; import static android.app.slice.Slice.HINT_TITLE; import static android.app.slice.SliceItem.FORMAT_TEXT; - -import static com.android.settings.slices.SettingsSliceProvider.EXTRA_SLICE_PLATFORM_DEFINED; - import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doReturn; @@ -35,25 +31,13 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.res.Resources; -import android.net.Uri; import android.telephony.CarrierConfigManager; -import androidx.slice.Slice; -import androidx.slice.SliceItem; -import androidx.slice.SliceMetadata; -import androidx.slice.SliceProvider; -import androidx.slice.core.SliceAction; -import androidx.slice.core.SliceQuery; -import androidx.slice.widget.ListContent; -import androidx.slice.widget.RowContent; -import androidx.slice.widget.SliceLiveData; - import com.android.ims.ImsConfig; 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; @@ -68,9 +52,18 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import androidx.slice.Slice; +import androidx.slice.SliceItem; +import androidx.slice.SliceMetadata; +import androidx.slice.SliceProvider; +import androidx.slice.core.SliceAction; +import androidx.slice.core.SliceQuery; +import androidx.slice.widget.ListContent; +import androidx.slice.widget.RowContent; +import androidx.slice.widget.SliceLiveData; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiCallingSliceHelperTest { diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 3989ee7fa591bc54424a32a9ed1fcb8cd961741f..32ffa9104dea4f1d12f7ad1f67377d0650c4c5db 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -30,7 +30,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; @@ -52,8 +51,6 @@ 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; @@ -92,6 +89,10 @@ import java.net.UnknownHostException; import java.util.Arrays; import java.util.stream.Collectors; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { ShadowDevicePolicyManager.class, diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java index 13dc51dcd690e0db829ea86e5b03718ecd6a3111..f90b8e2c7d57323d1e23a5bec8ed928821d21021 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.spy; import android.content.Context; import android.net.wifi.WifiConfiguration; -import androidx.preference.DropDownPreference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -32,6 +31,8 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.robolectric.RuntimeEnvironment; +import androidx.preference.DropDownPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiMeteredPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java index 41b70e2674c600b73fd62a272d1fe316557a39b6..2b00adc11d54cb72d0e033cc61a4de93b1ab810b 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pCategoryPreferenceControllerTest.java @@ -23,10 +23,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceScreen; - import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; @@ -36,6 +32,10 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class P2pCategoryPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java index 9741f4fd7351044783d95801100b8e68c7e032f4..4bc9028fda7700d9cc60d2621ecf5d26a23c4820 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/P2pThisDevicePreferenceControllerTest.java @@ -21,8 +21,6 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; import android.net.wifi.p2p.WifiP2pDevice; -import androidx.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -33,6 +31,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class P2pThisDevicePreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index fb4ffc354e2ff8eebe61bae0cc8e3f642141a126..e3be99251f7ed03cd4f816849bc3b575f273f078 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -24,14 +24,11 @@ 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.preference.Preference; -import androidx.preference.PreferenceScreen; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -43,6 +40,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiP2PPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index 4b2aa1c6418ef5a8a25620ce01e94b4526bb9c01..b9eed670328ebc77f0a8f101eceb24500c5f275a 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -28,9 +28,6 @@ import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; -import androidx.preference.ListPreference; -import androidx.preference.PreferenceScreen; - import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -41,6 +38,9 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherApBandPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java index 06373539f2e27f555a96fa1b89b952451e3f97cb..19f4edce048f5b7c3a8c65aafef47b346c00530d 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -20,7 +20,6 @@ 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; @@ -30,6 +29,8 @@ import org.junit.runner.RunWith; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.SwitchPreference; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherAutoOffPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java index a790d52aa854f5ab9c0fa0711c6553e5f1f2ea69..5a09be6e08b927e0505edcf46b1eca3fce6d722b 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceControllerTest.java @@ -26,7 +26,6 @@ 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; import com.android.settings.widget.ValidatedEditTextPreference; @@ -39,6 +38,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherPasswordPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index 9df86b879b39b49ed69e6770720af315ea3524d9..6352fc5ebddd1e4d72cee506c1a64a1d91c87f56 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -16,28 +16,20 @@ 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.preference.PreferenceScreen; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -56,6 +48,9 @@ import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.util.ReflectionHelpers; +import androidx.lifecycle.LifecycleOwner; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) @Config(shadows = { WifiTetherPreferenceControllerTest.ShadowWifiTetherSettings.class, diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java index bbd57cba34bc1e6d48cdb4287ac2a6c3d59b2135..bf70434bf1ca021a10555175a87568ca13641452 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSSIDPreferenceControllerTest.java @@ -26,7 +26,6 @@ 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; import com.android.settings.widget.ValidatedEditTextPreference; @@ -39,6 +38,8 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherSSIDPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java index 86f03e0fdf4694271e1032cee5b3e2cbc5955ca8..252de3842d08b598e62a13272f661e55e31e3907 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSecurityPreferenceControllerTest.java @@ -1,7 +1,6 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -10,19 +9,19 @@ 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; 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; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceScreen; + @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherSecurityPreferenceControllerTest { diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java index 58bb1989d988ddfb97b9f7f000daf8594595d80f..d376775d1a3bed4a3f4915fb8284cf457e972ff0 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java @@ -17,15 +17,14 @@ package com.android.settings.wifi.tether; 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 android.net.ConnectivityManager; import android.os.UserHandle; import android.os.UserManager; -import android.net.ConnectivityManager; import com.android.settings.testutils.SettingsRobolectricTestRunner; 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..bf6c725e69dd6d903e0ca85beb7d17466187ec62 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java @@ -17,11 +17,9 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy;