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/accessibility/AccessibilityServiceWarning.java

@@ -35,13 +35,13 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.settings.R;
 
 import java.util.List;
 import java.util.Locale;
 
-import androidx.appcompat.app.AlertDialog;
-
 /**
  * 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

@@ -39,6 +39,14 @@ import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.accessibility.AccessibilityManager;
 
+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;
+
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -61,14 +69,6 @@ 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

@@ -24,14 +24,14 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.accessibility.AccessibilityManager;
 
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 
 import java.util.List;
 
-import androidx.preference.Preference;
-
 /**
  * Activity with the accessibility settings specific to Setup Wizard.
  */

src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java

@@ -20,15 +20,15 @@ import android.os.Bundle;
 import android.view.Menu;
 import android.view.accessibility.AccessibilityEvent;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.SubSettingLauncher;
 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.PreferenceFragmentCompat;
-
 public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
 
     private static final String SAVE_KEY_TITLE = "activity_title";

src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java

@@ -28,6 +28,9 @@ import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -36,9 +39,6 @@ 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

@@ -31,6 +31,11 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
 
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceCategory;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.SubtitleView;
 import com.android.settings.R;
@@ -44,11 +49,6 @@ 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/ColorInversionPreferenceController.java

@@ -19,10 +19,10 @@ package com.android.settings.accessibility;
 import android.content.Context;
 import android.provider.Settings;
 
-import com.android.settings.core.TogglePreferenceController;
-
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.core.TogglePreferenceController;
+
 public class ColorInversionPreferenceController extends TogglePreferenceController {
     @VisibleForTesting
     static final int ON = 1;

src/com/android/settings/accessibility/ColorPreference.java

@@ -26,10 +26,10 @@ import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.android.settings.R;
-
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.settings.R;
+
 /**
  * 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/ListDialogPreference.java

@@ -30,10 +30,10 @@ import android.widget.AbsListView;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 
-import com.android.settingslib.CustomDialogPreferenceCompat;
-
 import androidx.appcompat.app.AlertDialog.Builder;
 
+import com.android.settingslib.CustomDialogPreferenceCompat;
+
 /**
  * Abstract dialog preference that displays a set of values and optional titles.
  */

src/com/android/settings/accessibility/LocalePreference.java

@@ -19,13 +19,13 @@ package com.android.settings.accessibility;
 import android.content.Context;
 import android.util.AttributeSet;
 
+import androidx.preference.ListPreference;
+
 import com.android.internal.app.LocalePicker;
 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/ShortcutServicePickerFragment.java

@@ -16,6 +16,7 @@
 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
@@ -38,6 +39,9 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.accessibility.AccessibilityManager;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.internal.accessibility.AccessibilityShortcutController
         .ToggleableFrameworkFeatureInfo;
@@ -53,9 +57,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
 /**
  * Fragment for picking accessibility shortcut service
  */

src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java

@@ -35,6 +35,8 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.accessibility.AccessibilityManager;
 
+import androidx.appcompat.app.AlertDialog;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
@@ -45,8 +47,6 @@ import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
 
-import androidx.appcompat.app.AlertDialog;
-
 public class ToggleAccessibilityServicePreferenceFragment
         extends ToggleFeaturePreferenceFragment implements DialogInterface.OnClickListener {
 

src/com/android/settings/accessibility/ToggleAutoclickPreferenceFragment.java

@@ -24,6 +24,8 @@ import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -35,8 +37,6 @@ import com.android.settingslib.search.SearchIndexable;
 import java.util.ArrayList;
 import java.util.List;
 
-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

@@ -23,6 +23,9 @@ import android.provider.Settings;
 import android.view.accessibility.AccessibilityManager;
 import android.widget.Switch;
 
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -33,9 +36,6 @@ import com.android.settingslib.search.SearchIndexable;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.preference.ListPreference;
-import androidx.preference.Preference;
-
 @SearchIndexable
 public class ToggleDaltonizerPreferenceFragment extends ToggleFeaturePreferenceFragment
         implements Preference.OnPreferenceChangeListener, SwitchBar.OnSwitchChangeListener {

src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java

@@ -21,15 +21,15 @@ import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 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/ToggleScreenMagnificationPreferenceFragment.java

@@ -33,14 +33,14 @@ import android.widget.RelativeLayout.LayoutParams;
 import android.widget.Switch;
 import android.widget.VideoView;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.widget.SwitchBar;
-
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.widget.SwitchBar;
+
 public class ToggleScreenMagnificationPreferenceFragment extends
         ToggleFeaturePreferenceFragment implements SwitchBar.OnSwitchChangeListener {
 

src/com/android/settings/accessibility/VibrationIntensityPreferenceController.java

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

@@ -29,6 +29,8 @@ import android.provider.Settings;
 import android.util.ArrayMap;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.widget.RadioButtonPickerFragment;
 import com.android.settingslib.widget.CandidateInfo;
@@ -38,8 +40,6 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Fragment for changing vibration settings.
  */