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/applications/assist/AssistContextPreferenceController.java

@@ -21,6 +21,10 @@ import android.net.Uri;
 import android.os.UserHandle;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -32,10 +36,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import java.util.Arrays;
 import java.util.List;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
 public class AssistContextPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
         LifecycleObserver, OnResume, OnPause {

src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java

@@ -22,6 +22,11 @@ import android.net.Uri;
 import android.os.UserHandle;
 import android.provider.Settings;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -33,11 +38,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import java.util.Arrays;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
 public class AssistFlashScreenPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
         LifecycleObserver, OnResume, OnPause {

src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java

@@ -21,6 +21,10 @@ import android.net.Uri;
 import android.os.UserHandle;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
 import com.android.internal.app.AssistUtils;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -32,10 +36,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 import java.util.Arrays;
 import java.util.List;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.TwoStatePreference;
-
 public class AssistScreenshotPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
         LifecycleObserver, OnResume, OnPause {

src/com/android/settings/applications/assist/AssistSettingObserver.java

@@ -21,12 +21,12 @@ import android.database.ContentObserver;
 import android.net.Uri;
 import android.provider.Settings;
 
+import androidx.annotation.MainThread;
+
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
 
-import androidx.annotation.MainThread;
-
 public abstract class AssistSettingObserver extends ContentObserver {
 
     private final Uri ASSIST_URI =

src/com/android/settings/applications/assist/DefaultAssistPicker.java

@@ -29,6 +29,8 @@ import android.speech.RecognitionService;
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.app.AssistUtils;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
@@ -39,8 +41,6 @@ import com.android.settingslib.widget.CandidateInfo;
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-
 public class DefaultAssistPicker extends DefaultAppPickerFragment {
 
     private static final String TAG = "DefaultAssistPicker";

src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java

@@ -24,6 +24,8 @@ import android.content.pm.ResolveInfo;
 import android.service.voice.VoiceInteractionService;
 import android.service.voice.VoiceInteractionServiceInfo;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.app.AssistUtils;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
@@ -31,8 +33,6 @@ import com.android.settingslib.applications.DefaultAppInfo;
 
 import java.util.List;
 
-import androidx.annotation.VisibleForTesting;
-
 public class DefaultAssistPreferenceController extends DefaultAppPreferenceController {
 
     private final AssistUtils mAssistUtils;

src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java

@@ -22,6 +22,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
 import com.android.internal.app.AssistUtils;
 import com.android.settings.applications.defaultapps.DefaultAppPreferenceController;
 import com.android.settingslib.applications.DefaultAppInfo;
@@ -32,9 +35,6 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
 
 import java.util.List;
 
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
 public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceController
         implements LifecycleObserver, OnResume, OnPause {