DO NOT MERGE Import clean up.

Reordered all imports according to Android codestyle.

Test: rebuild
Change-Id: I750f01f70f2114d51838bf652833aebdc4065c98

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

@@ -19,13 +19,16 @@ 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 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;
 
 public class AutoTimeFormatPreferenceController extends AbstractPreferenceController

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

@@ -18,6 +18,7 @@ package com.android.settings.datetime;
 
 import android.content.Context;
 import android.provider.Settings;
+
 import androidx.preference.Preference;
 
 import com.android.settings.core.PreferenceControllerMixin;

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

@@ -18,8 +18,9 @@ package com.android.settings.datetime;
 
 import android.content.Context;
 import android.provider.Settings;
-import androidx.preference.SwitchPreference;
+
 import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.Utils;

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

@@ -20,12 +20,13 @@ import android.app.Activity;
 import android.app.AlarmManager;
 import android.app.DatePickerDialog;
 import android.content.Context;
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
 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;

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

@@ -19,12 +19,13 @@ 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;
 
+import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
+import androidx.preference.TwoStatePreference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.AbstractPreferenceController;
 

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

@@ -20,11 +20,12 @@ 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;
 
+import androidx.preference.Preference;
+
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;

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

@@ -17,9 +17,10 @@
 package com.android.settings.datetime;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
+
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
-import android.util.FeatureFlagUtils;
 
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.PreferenceControllerMixin;

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

@@ -22,7 +22,6 @@ import android.app.AlarmManager;
 import android.app.ListFragment;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.VisibleForTesting;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -33,6 +32,8 @@ import android.widget.ListView;
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.overlay.FeatureFactory;

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;
@@ -29,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;
 

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

@@ -23,6 +23,7 @@ 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;

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,9 @@ import android.widget.LinearLayout;
 import android.widget.SearchView;
 import android.widget.TextView;
 
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+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;

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

@@ -17,6 +17,7 @@
 package com.android.settings.datetime.timezone;
 
 import android.content.Context;
+
 import androidx.preference.Preference;
 
 import com.android.settings.core.BasePreferenceController;

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,9 +21,10 @@ 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 androidx.annotation.VisibleForTesting;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;

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

@@ -21,9 +21,10 @@ import android.icu.text.Collator;
 import android.icu.text.LocaleDisplayNames;
 import android.icu.util.TimeZone;
 import android.os.Bundle;
+import android.util.Log;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import android.util.Log;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;

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

@@ -17,6 +17,7 @@
 package com.android.settings.datetime.timezone;
 
 import android.content.Context;
+
 import androidx.preference.Preference;
 
 import com.android.settings.R;

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

@@ -24,6 +24,7 @@ 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;
 

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

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