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/slices/CustomSliceable.java

@@ -22,11 +22,11 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.Uri;
 
+import androidx.slice.Slice;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-import androidx.slice.Slice;
-
 
 /**
  * Common functions for custom Slices.

src/com/android/settings/slices/SettingsSliceProvider.java

@@ -32,6 +32,10 @@ import android.util.KeyValueListParser;
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.flashlight.FlashlightSliceBuilder;
@@ -39,7 +43,6 @@ import com.android.settings.location.LocationSliceBuilder;
 import com.android.settings.mobilenetwork.Enhanced4gLteSliceHelper;
 import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.core.BasePreferenceController;
 import com.android.settings.wifi.WifiSlice;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
 import com.android.settingslib.SliceBroadcastRelay;
@@ -56,10 +59,6 @@ import java.util.Set;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.slice.Slice;
-import androidx.slice.SliceProvider;
-
 /**
  * A {@link SliceProvider} for Settings to enabled inline results in system apps.
  *

src/com/android/settings/slices/SliceBuilderUtils.java

@@ -33,6 +33,14 @@ import android.util.ArraySet;
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.InputRangeBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -45,20 +53,11 @@ import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.ListBuilder.InputRangeBuilder;
-import androidx.slice.builders.ListBuilder.RowBuilder;
-import androidx.slice.builders.SliceAction;
-
 
 /**
  * Utility class to build Slices objects and Preference Controllers based on the Database managed

src/com/android/settings/slices/SliceDataConverter.java

@@ -39,6 +39,8 @@ import android.util.Log;
 import android.util.Xml;
 import android.view.accessibility.AccessibilityManager;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilitySettings;
 import com.android.settings.accessibility.AccessibilitySlicePreferenceController;
@@ -61,8 +63,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Converts all Slice sources into {@link SliceData}.
  * This includes:

src/com/android/settings/slices/SliceDeepLinkSpringBoard.java

@@ -16,7 +16,6 @@ package com.android.settings.slices;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -26,7 +25,6 @@ import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.location.LocationSliceBuilder;
 import com.android.settings.notification.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.WifiSlice;
 
 import java.net.URISyntaxException;
 

src/com/android/settings/slices/SliceRelayReceiver.java

@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
+
 import com.android.settingslib.SliceBroadcastRelay;
 
 /**

src/com/android/settings/slices/SlicesDatabaseAccessor.java

@@ -25,14 +25,14 @@ import android.net.Uri;
 import android.os.Binder;
 import android.util.Pair;
 
+import androidx.slice.Slice;
+
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.SlicesDatabaseHelper.IndexColumns;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.slice.Slice;
-
 /**
  * Class used to map a {@link Uri} from {@link SettingsSliceProvider} to a Slice.
  */

src/com/android/settings/slices/SlicesDatabaseHelper.java

@@ -22,10 +22,10 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.util.Log;
 
-import java.util.Locale;
-
 import androidx.annotation.VisibleForTesting;
 
+import java.util.Locale;
+
 /**
  * Defines the schema for the Slices database.
  */

src/com/android/settings/slices/SlicesIndexer.java

@@ -21,6 +21,8 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
@@ -29,8 +31,6 @@ import com.android.settings.slices.SlicesDatabaseHelper.Tables;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Manages the conversion of {@link DashboardFragment} and {@link BasePreferenceController} to
  * indexable data {@link SliceData} to be stored for Slices.