Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68

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

@@ -19,15 +19,18 @@ package com.android.settings.datetime;
 import android.content.Context;
 import android.provider.Settings;
 import android.provider.Settings.System;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import androidx.preference.TwoStatePreference;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
+
 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

@@ -18,13 +18,14 @@ 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

@@ -18,13 +18,14 @@ package com.android.settings.datetime;
 
 import android.content.Context;
 import android.provider.Settings;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
 
 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/TimeFormatPreferenceController.java

@@ -19,9 +19,6 @@ package com.android.settings.datetime;
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import androidx.preference.TwoStatePreference;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 
@@ -31,6 +28,10 @@ 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

@@ -20,7 +20,6 @@ import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.TimePickerDialog;
 import android.content.Context;
-import androidx.preference.Preference;
 import android.text.TextUtils;
 import android.text.format.DateFormat;
 import android.widget.TimePicker;
@@ -31,6 +30,8 @@ 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

@@ -17,8 +17,6 @@
 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;
@@ -27,6 +25,9 @@ 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

@@ -17,11 +17,6 @@
 package com.android.settings.datetime.timezone;
 
 import android.icu.text.BreakIterator;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.annotation.WorkerThread;
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -36,6 +31,12 @@ 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

@@ -23,7 +23,6 @@ import android.content.res.Resources;
 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;
@@ -33,6 +32,8 @@ 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

@@ -17,9 +17,6 @@
 package com.android.settings.datetime.timezone;
 
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -30,7 +27,6 @@ import android.widget.LinearLayout;
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
@@ -38,6 +34,9 @@ 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

@@ -17,12 +17,13 @@
 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/RegionPreferenceController.java

@@ -17,7 +17,6 @@ package com.android.settings.datetime.timezone;
 
 import android.content.Context;
 import android.icu.text.LocaleDisplayNames;
-import androidx.preference.Preference;
 
 import java.util.Locale;
 

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

@@ -21,7 +21,6 @@ import android.content.Intent;
 import android.icu.text.Collator;
 import android.icu.text.LocaleDisplayNames;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -37,6 +36,8 @@ 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

@@ -21,8 +21,6 @@ import android.icu.text.Collator;
 import android.icu.text.LocaleDisplayNames;
 import android.icu.util.TimeZone;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
@@ -38,6 +36,9 @@ 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

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

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

@@ -24,14 +24,15 @@ import android.icu.text.SimpleDateFormat;
 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

@@ -23,8 +23,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.icu.util.TimeZone;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceCategory;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -46,6 +44,9 @@ 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,9 +15,6 @@
  */
 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;
@@ -29,6 +26,9 @@ 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.