Sort imports

Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b

src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java

@@ -23,13 +23,13 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 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 {
 

src/com/android/settings/security/ChangeScreenLockPreferenceController.java

@@ -23,6 +23,9 @@ import android.os.UserManager;
 import android.os.storage.StorageManager;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.Utils;
@@ -36,9 +39,6 @@ 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 {
 

src/com/android/settings/security/ConfigureKeyGuardDialog.java

@@ -23,15 +23,15 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.CredentialStorage;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.password.ChooseLockGeneric;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-
 /**
  * Prompt for key guard configuration confirmation.
  */

src/com/android/settings/security/CredentialStoragePreferenceController.java

@@ -20,10 +20,10 @@ import android.content.Context;
 import android.os.UserManager;
 import android.security.KeyStore;
 
-import com.android.settings.R;
-
 import androidx.preference.Preference;
 
+import com.android.settings.R;
+
 public class CredentialStoragePreferenceController extends
         RestrictedEncryptionPreferenceController {
 

src/com/android/settings/security/CryptKeeperSettings.java

@@ -33,6 +33,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.CryptKeeperConfirm;
 import com.android.settings.R;
@@ -41,9 +44,6 @@ import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.ConfirmLockPattern;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-
 public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
     private static final String TAG = "CryptKeeper";
     private static final String TYPE = "type";

src/com/android/settings/security/EncryptionStatusPreferenceController.java

@@ -20,12 +20,12 @@ import android.content.Context;
 import android.os.UserManager;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 
-import androidx.preference.Preference;
-
 public class EncryptionStatusPreferenceController extends BasePreferenceController {
 
 

src/com/android/settings/security/LockUnificationPreferenceController.java

@@ -28,6 +28,9 @@ 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;
 import com.android.settings.Utils;
@@ -40,9 +43,6 @@ import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 /**
  * Controller for password unification/un-unification flows.
  *

src/com/android/settings/security/OwnerInfoPreferenceController.java

@@ -18,6 +18,12 @@ package com.android.settings.security;
 import android.content.Context;
 import android.os.UserHandle;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+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;
 import com.android.settings.users.OwnerInfoSettings;
@@ -29,12 +35,6 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceClickListener;
-import androidx.preference.PreferenceScreen;
-
 public class OwnerInfoPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume {
 

src/com/android/settings/security/ResetCredentialsPreferenceController.java

@@ -20,13 +20,13 @@ 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 {
 

src/com/android/settings/security/ScreenPinningSettings.java

@@ -27,6 +27,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
@@ -40,11 +45,6 @@ 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.
  */

src/com/android/settings/security/SimLockPreferenceController.java

@@ -24,13 +24,13 @@ import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.core.BasePreferenceController;
 
 import java.util.List;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class SimLockPreferenceController extends BasePreferenceController {
 
     private static final String KEY_SIM_LOCK = "sim_lock_settings";

src/com/android/settings/security/UnificationConfirmationDialog.java

@@ -20,13 +20,13 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentManager;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentManager;
-
 public class UnificationConfirmationDialog extends InstrumentedDialogFragment {
 
     static final String TAG_UNIFICATION_DIALOG = "unification_dialog";

src/com/android/settings/security/VisiblePatternProfilePreferenceController.java

@@ -24,6 +24,9 @@ import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.Utils;
 import com.android.settings.core.TogglePreferenceController;
@@ -35,9 +38,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class VisiblePatternProfilePreferenceController extends TogglePreferenceController
         implements LifecycleObserver, OnResume {
 

src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java

@@ -25,6 +25,8 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.preference.Preference;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -34,8 +36,6 @@ 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 {
 

src/com/android/settings/security/screenlock/LockScreenPreferenceController.java

@@ -21,6 +21,9 @@ import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED
 import android.content.Context;
 import android.os.UserHandle;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.notification.LockScreenNotificationPreferenceController;
@@ -28,9 +31,6 @@ import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnResume;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class LockScreenPreferenceController extends BasePreferenceController implements
         LifecycleObserver, OnResume {
 

src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java

@@ -19,13 +19,13 @@ 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 {
 

src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java

@@ -20,6 +20,9 @@ import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+import androidx.preference.TwoStatePreference;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -27,9 +30,6 @@ 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 {
 

src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java

@@ -19,15 +19,15 @@ 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;
 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

src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java

@@ -25,6 +25,11 @@ import android.os.Bundle;
 import android.os.UserHandle;
 import android.text.TextUtils;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
@@ -42,11 +47,6 @@ 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 {

src/com/android/settings/security/trustagent/TrustAgentManager.java

@@ -35,6 +35,8 @@ import android.util.Log;
 import android.util.Slog;
 import android.util.Xml;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settingslib.RestrictedLockUtils;
 
@@ -45,8 +47,6 @@ 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 {

src/com/android/settings/security/trustagent/TrustAgentsPreferenceController.java

@@ -32,6 +32,10 @@ import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.IconDrawableFactory;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
@@ -43,10 +47,6 @@ import com.android.settingslib.core.lifecycle.events.OnStart;
 
 import java.util.List;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
 public class TrustAgentsPreferenceController extends BasePreferenceController
         implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart {