Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

src/com/android/settings/dashboard/DashboardAdapter.java

@@ -21,10 +21,6 @@ import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.service.settings.suggestions.Suggestion;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.DiffUtil;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -54,6 +50,11 @@ import com.android.settingslib.utils.IconCache;
 
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class DashboardAdapter extends RecyclerView.Adapter<DashboardAdapter.DashboardItemHolder>
         implements SummaryLoader.SummaryConsumer, SuggestionAdapter.Callback, LifecycleObserver,
         OnSaveInstanceState {

src/com/android/settings/dashboard/DashboardData.java

@@ -18,8 +18,6 @@ package com.android.settings.dashboard;
 import android.annotation.IntDef;
 import android.graphics.drawable.Drawable;
 import android.service.settings.suggestions.Suggestion;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.DiffUtil;
 import android.text.TextUtils;
 
 import com.android.settings.R;
@@ -33,6 +31,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.DiffUtil;
+
 /**
  * Description about data list used in the DashboardAdapter. In the data list each item can be
  * Condition, suggestion or category tile.

src/com/android/settings/dashboard/DashboardFeatureProvider.java

@@ -17,13 +17,14 @@ package com.android.settings.dashboard;
 
 import android.app.Activity;
 import android.content.Context;
-import androidx.preference.Preference;
 
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.List;
 
+import androidx.preference.Preference;
+
 /**
  * FeatureProvider for dashboard (aka settings homepage).
  */

src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java

@@ -29,8 +29,6 @@ import android.content.pm.PackageManager;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.provider.Settings;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
@@ -53,6 +51,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
 /**
  * Impl for {@code DashboardFeatureProvider}.
  */

src/com/android/settings/dashboard/DashboardFragment.java

@@ -19,10 +19,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -47,6 +43,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+
 /**
  * Base fragment for dashboard style UI containing a list of static and dynamic setting items.
  */

src/com/android/settings/dashboard/DashboardItemAnimator.java

@@ -15,10 +15,11 @@
  */
 package com.android.settings.dashboard;
 
+import com.android.settingslib.drawer.Tile;
+
 import androidx.core.view.ViewCompat;
 import androidx.recyclerview.widget.DefaultItemAnimator;
 import androidx.recyclerview.widget.RecyclerView.ViewHolder;
-import com.android.settingslib.drawer.Tile;
 
 public class DashboardItemAnimator extends DefaultItemAnimator {
 

src/com/android/settings/dashboard/DashboardSummary.java

@@ -22,9 +22,6 @@ import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.service.settings.suggestions.Suggestion;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,6 +47,10 @@ import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
+import androidx.recyclerview.widget.LinearLayoutManager;
+
 public class DashboardSummary extends InstrumentedFragment
         implements CategoryListener, ConditionListener,
         FocusListener, SuggestionControllerMixin.SuggestionControllerHost {

src/com/android/settings/dashboard/DashboardTilePlaceholderPreferenceController.java

@@ -17,12 +17,13 @@
 package com.android.settings.dashboard;
 
 import android.content.Context;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 /**
  * PreferenceController for a dashboard_tile_placeholder, a special preference marking where
  * dynamic dashboard tiles should be injected in a screen. It is optional when building

src/com/android/settings/dashboard/RestrictedDashboardFragment.java

@@ -32,9 +32,9 @@ import android.os.UserManager;
 import android.view.View;
 import android.widget.TextView;
 
-import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
 import com.android.settingslib.RestrictedLockUtils;
 
 /**

src/com/android/settings/dashboard/SummaryLoader.java

@@ -25,7 +25,6 @@ import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
-import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -40,6 +39,8 @@ import com.android.settingslib.utils.ThreadUtils;
 import java.lang.reflect.Field;
 import java.util.List;
 
+import androidx.annotation.VisibleForTesting;
+
 public class SummaryLoader {
     private static final boolean DEBUG = DashboardSummary.DEBUG;
     private static final String TAG = "SummaryLoader";

src/com/android/settings/dashboard/conditional/BatterySaverCondition.java

@@ -22,7 +22,6 @@ import android.os.PowerManager;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.fuelgauge.BatterySaverDrawable;
 import com.android.settings.fuelgauge.BatterySaverReceiver;
 import com.android.settings.fuelgauge.batterysaver.BatterySaverSettings;
 import com.android.settingslib.fuelgauge.BatterySaverUtils;

src/com/android/settings/dashboard/conditional/Condition.java

@@ -21,12 +21,13 @@ import android.content.Context;
 import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
 import android.os.PersistableBundle;
-import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
+import androidx.annotation.VisibleForTesting;
+
 public abstract class Condition {
 
     private static final String KEY_SILENCE = "silence";

src/com/android/settings/dashboard/conditional/ConditionAdapter.java

@@ -16,9 +16,6 @@
 package com.android.settings.dashboard.conditional;
 
 import android.content.Context;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -35,6 +32,10 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class ConditionAdapter extends RecyclerView.Adapter<DashboardItemHolder> {
     public static final String TAG = "ConditionAdapter";
 

src/com/android/settings/dashboard/conditional/DndCondition.java

@@ -25,13 +25,14 @@ import android.os.PersistableBundle;
 import android.provider.Settings;
 import android.provider.Settings.Global;
 import android.service.notification.ZenModeConfig;
-import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.ZenModeSettings;
 
+import androidx.annotation.VisibleForTesting;
+
 public class DndCondition extends Condition {
 
     private static final String TAG = "DndCondition";

src/com/android/settings/dashboard/conditional/FocusRecyclerView.java

@@ -16,9 +16,10 @@
 package com.android.settings.dashboard.conditional;
 
 import android.content.Context;
+import android.util.AttributeSet;
+
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-import android.util.AttributeSet;
 
 /**
  * Version of RecyclerView that can have listeners for onWindowFocusChanged.

src/com/android/settings/dashboard/suggestions/SuggestionAdapter.java

@@ -23,8 +23,6 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.service.settings.suggestions.Suggestion;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -32,7 +30,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -51,6 +48,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+
 public class SuggestionAdapter extends RecyclerView.Adapter<DashboardItemHolder> implements
     LifecycleObserver, OnSaveInstanceState {
     public static final String TAG = "SuggestionAdapter";

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java

@@ -20,7 +20,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.service.settings.suggestions.Suggestion;
-import androidx.annotation.NonNull;
 import android.util.Pair;
 
 import com.android.settingslib.drawer.Tile;
@@ -28,6 +27,8 @@ import com.android.settingslib.suggestions.SuggestionControllerMixin;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 /** Interface should be implemented if you have added new suggestions */
 public interface SuggestionFeatureProvider {
 

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java

@@ -21,9 +21,6 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.service.settings.suggestions.Suggestion;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 import android.util.Pair;
 
@@ -46,6 +43,8 @@ import com.android.settingslib.suggestions.SuggestionControllerMixin;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {
 
     private static final String TAG = "SuggestionFeature";

src/com/android/settings/dashboard/suggestions/SuggestionStateProvider.java

@@ -25,11 +25,12 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 
 import com.android.settings.overlay.FeatureFactory;
 
+import androidx.annotation.VisibleForTesting;
+
 public class SuggestionStateProvider extends ContentProvider {
 
     private static final String TAG = "SugstStatusProvider";