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/datetime/AutoTimeFormatPreferenceController.java

@@ -22,15 +22,15 @@ import android.provider.Settings.System;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Locale;
 
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.TwoStatePreference;
-
 public class AutoTimeFormatPreferenceController extends AbstractPreferenceController
           implements PreferenceControllerMixin {
 

src/com/android/settings/datetime/AutoTimePreferenceController.java

@@ -19,13 +19,13 @@ package com.android.settings.datetime;
 import android.content.Context;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import androidx.preference.Preference;
-
 public class AutoTimePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 

src/com/android/settings/datetime/AutoTimeZonePreferenceController.java

@@ -19,13 +19,13 @@ package com.android.settings.datetime;
 import android.content.Context;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
 public class AutoTimeZonePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 

src/com/android/settings/datetime/DatePreferenceController.java

@@ -24,15 +24,15 @@ import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.widget.DatePicker;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
 public class DatePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, DatePickerDialog.OnDateSetListener {
 

src/com/android/settings/datetime/TimeFormatPreferenceController.java

@@ -22,16 +22,16 @@ import android.provider.Settings;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
 import java.util.Date;
 
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.TwoStatePreference;
-
 public class TimeFormatPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 

src/com/android/settings/datetime/TimePreferenceController.java

@@ -24,14 +24,14 @@ import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.widget.TimePicker;
 
+import androidx.preference.Preference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.Calendar;
 
-import androidx.preference.Preference;
-
 public class TimePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, TimePickerDialog.OnTimeSetListener {
 

src/com/android/settings/datetime/TimeZonePreferenceController.java

@@ -18,6 +18,9 @@ package com.android.settings.datetime;
 
 import android.content.Context;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -25,9 +28,6 @@ import com.android.settingslib.datetime.ZoneGetter;
 
 import java.util.Calendar;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
 public class TimeZonePreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin {
 

src/com/android/settings/datetime/timezone/BaseTimeZoneAdapter.java

@@ -24,6 +24,12 @@ import android.view.ViewGroup;
 import android.widget.Filter;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.annotation.WorkerThread;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.settings.R;
 import com.android.settings.datetime.timezone.BaseTimeZonePicker.OnListItemClickListener;
 
@@ -31,12 +37,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * Used with {@class BaseTimeZonePicker}. It renders text in each item into list view. A list of
  * {@class AdapterItem} must be provided when an instance is created.

src/com/android/settings/datetime/timezone/BaseTimeZoneInfoPicker.java

@@ -24,6 +24,8 @@ import android.icu.text.DateFormat;
 import android.icu.text.SimpleDateFormat;
 import android.icu.util.Calendar;
 
+import androidx.annotation.Nullable;
+
 import com.android.settings.R;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
@@ -32,8 +34,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import androidx.annotation.Nullable;
-
 /**
  * Render a list of {@class TimeZoneInfo} into the list view in {@class BaseTimeZonePicker}
  */

src/com/android/settings/datetime/timezone/BaseTimeZonePicker.java

@@ -27,6 +27,9 @@ import android.widget.LinearLayout;
 import android.widget.SearchView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -34,9 +37,6 @@ import com.android.settings.datetime.timezone.model.TimeZoneDataLoader;
 
 import java.util.Locale;
 
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 /**
  * It's abstract class. Subclass should use it with {@class BaseTimeZoneAdapter} and
  * {@class AdapterItem} to provide a list view with text search capability.

src/com/android/settings/datetime/timezone/BaseTimeZonePreferenceController.java

@@ -18,12 +18,12 @@ package com.android.settings.datetime.timezone;
 
 import android.content.Context;
 
+import androidx.preference.Preference;
+
 import com.android.settings.core.BasePreferenceController;
 
 import com.google.common.base.Objects;
 
-import androidx.preference.Preference;
-
 public abstract class BaseTimeZonePreferenceController extends BasePreferenceController {
     private OnPreferenceClickListener mOnClickListener;
 

src/com/android/settings/datetime/timezone/RegionSearchPicker.java

@@ -23,6 +23,8 @@ import android.icu.text.LocaleDisplayNames;
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
@@ -36,8 +38,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Render a list of regions into a list view.
  */

src/com/android/settings/datetime/timezone/RegionZonePicker.java

@@ -23,6 +23,9 @@ import android.icu.util.TimeZone;
 import android.os.Bundle;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.datetime.timezone.model.FilteredCountryTimeZones;
@@ -36,9 +39,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.TreeSet;
 
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Given a region, render a list of time zone {@class TimeZoneInfo} into a list view.
  */

src/com/android/settings/datetime/timezone/RegionZonePreferenceController.java

@@ -18,10 +18,10 @@ package com.android.settings.datetime.timezone;
 
 import android.content.Context;
 
-import com.android.settings.R;
-
 import androidx.preference.Preference;
 
+import com.android.settings.R;
+
 public class RegionZonePreferenceController extends BaseTimeZonePreferenceController {
     private static final String PREFERENCE_KEY = "region_zone";
 

src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceController.java

@@ -25,14 +25,14 @@ import android.icu.util.Calendar;
 import android.icu.util.TimeZone;
 import android.icu.util.TimeZoneTransition;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settingslib.widget.FooterPreference;
 
 import java.util.Date;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
 public class TimeZoneInfoPreferenceController extends BaseTimeZonePreferenceController {
 
     private static final String PREFERENCE_KEY = FooterPreference.KEY_FOOTER;

src/com/android/settings/datetime/timezone/TimeZoneSettings.java

@@ -28,6 +28,9 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceCategory;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
@@ -44,9 +47,6 @@ import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceCategory;
-
 /**
  * The class displays a time zone picker either by regions or fixed offset time zones.
  */

src/com/android/settings/datetime/timezone/model/TimeZoneData.java

@@ -15,6 +15,9 @@
  */
 package com.android.settings.datetime.timezone.model;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.collection.ArraySet;
+
 import libcore.util.CountryTimeZones;
 import libcore.util.CountryZonesFinder;
 import libcore.util.TimeZoneFinder;
@@ -26,9 +29,6 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.collection.ArraySet;
-
 /**
  * Wrapper of CountryZonesFinder to normalize the country code and only show the regions that are
  * has time zone shown in the time zone picker.

src/com/android/settings/datetime/timezone/model/TimeZoneDataLoader.java

@@ -19,11 +19,11 @@ package com.android.settings.datetime.timezone.model;
 import android.content.Context;
 import android.os.Bundle;
 
-import com.android.settingslib.utils.AsyncLoaderCompat;
-
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
+import com.android.settingslib.utils.AsyncLoaderCompat;
+
 public class TimeZoneDataLoader extends AsyncLoaderCompat<TimeZoneData> {
 
     public TimeZoneDataLoader(Context context) {