Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

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;
 

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) {

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;

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;
 

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) {

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;
 

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

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

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

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

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.
  */

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
  */

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);

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 {

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,

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:

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

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;
 

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;

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;

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

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.

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,

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}

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.
  */

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.
  */

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;
 

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

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.
  */

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

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;
 
 

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.
  */

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;

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;

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";

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";

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

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.
  */

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.
  */

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";

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
  */

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.
  */

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.

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.

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

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.

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;

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;

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

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;

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;

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;

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.

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;

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;

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;

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

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;

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 {
 

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.
  */

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";

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();

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 {
 

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.

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 {

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 {

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 {
 

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.

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.

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 {
 

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 {
 

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 {
 

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;

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 {
 

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;

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 {

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.

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;

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;

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;

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<AppStorageStats> {

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.
  */

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();

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;

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).
  *

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;

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);

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;

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;
 

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 {
 

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 {

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";

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;

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".

src/com/android/settings/applications/SpacePreference.java

@@ -17,12 +17,14 @@ package com.android.settings.applications;
 
 import android.content.Context;
 import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.ViewGroup.LayoutParams;
+
+import com.android.settings.R;
+
 import androidx.core.content.res.TypedArrayUtils;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
-import android.util.AttributeSet;
-import android.view.ViewGroup.LayoutParams;
-import com.android.settings.R;
 
 /**
  * A blank preference that has a specified height by android:layout_height.  It can be used

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 {
 

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 {

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<BatteryStatsHelper>,
         LifecycleObserver, OnResume, OnPause {

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

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<ChartData>, LifecycleObserver, OnResume, OnPause {