Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

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