diff options
author | Fan Zhang <zhfan@google.com> | 2018-08-28 15:11:40 -0700 |
---|---|---|
committer | Fan Zhang <zhfan@google.com> | 2018-08-28 22:13:15 +0000 |
commit | 23f8d59d0208c87a759c5a3a7faa8afe4a4e213c (patch) | |
tree | 9b84a5fda61d36c7173932adb34d005802e70714 /src/com/android/settings/users | |
parent | 61a909c6624d4ed526f0b462e9272e885f0bf3d9 (diff) | |
download | packages_apps_Settings-23f8d59d0208c87a759c5a3a7faa8afe4a4e213c.tar.gz packages_apps_Settings-23f8d59d0208c87a759c5a3a7faa8afe4a4e213c.tar.bz2 packages_apps_Settings-23f8d59d0208c87a759c5a3a7faa8afe4a4e213c.zip |
Sort imports
Having consistent import order will reduce chance of merge
conflict between internal and external master
Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Diffstat (limited to 'src/com/android/settings/users')
11 files changed, 38 insertions, 38 deletions
diff --git a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java index 2a61cac882..c097d416d4 100644 --- a/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java +++ b/src/com/android/settings/users/AddUserWhenLockedPreferenceController.java @@ -18,11 +18,11 @@ package com.android.settings.users; import android.content.Context; import android.provider.Settings; +import androidx.preference.Preference; + import com.android.settings.core.TogglePreferenceController; import com.android.settingslib.RestrictedSwitchPreference; -import androidx.preference.Preference; - public class AddUserWhenLockedPreferenceController extends TogglePreferenceController { private final UserCapabilities mUserCaps; diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java index 15e721aefe..a4e0cff5c3 100644 --- a/src/com/android/settings/users/AppRestrictionsFragment.java +++ b/src/com/android/settings/users/AppRestrictionsFragment.java @@ -44,6 +44,15 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Switch; +import androidx.preference.ListPreference; +import androidx.preference.MultiSelectListPreference; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference.OnPreferenceClickListener; +import androidx.preference.PreferenceGroup; +import androidx.preference.PreferenceViewHolder; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.SettingsPreferenceFragment; @@ -58,15 +67,6 @@ import java.util.List; import java.util.Set; import java.util.StringTokenizer; -import androidx.preference.ListPreference; -import androidx.preference.MultiSelectListPreference; -import androidx.preference.Preference; -import androidx.preference.Preference.OnPreferenceChangeListener; -import androidx.preference.Preference.OnPreferenceClickListener; -import androidx.preference.PreferenceGroup; -import androidx.preference.PreferenceViewHolder; -import androidx.preference.SwitchPreference; - public class AppRestrictionsFragment extends SettingsPreferenceFragment implements OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener, AppRestrictionsHelper.OnDisableUiForPackageListener { diff --git a/src/com/android/settings/users/AutoSyncDataPreferenceController.java b/src/com/android/settings/users/AutoSyncDataPreferenceController.java index 5856f71e1e..13a2cdf465 100644 --- a/src/com/android/settings/users/AutoSyncDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncDataPreferenceController.java @@ -26,17 +26,17 @@ import android.os.UserHandle; import android.os.UserManager; import android.util.Log; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settingslib.core.AbstractPreferenceController; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - public class AutoSyncDataPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin { diff --git a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java index de7c24aa8f..1e6284509a 100644 --- a/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java +++ b/src/com/android/settings/users/AutoSyncWorkDataPreferenceController.java @@ -18,10 +18,10 @@ package com.android.settings.users; import android.content.Context; import android.os.UserHandle; -import com.android.settings.Utils; - import androidx.fragment.app.Fragment; +import com.android.settings.Utils; + public class AutoSyncWorkDataPreferenceController extends AutoSyncPersonalDataPreferenceController { private static final String TAG = "AutoSyncWorkData"; diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java index 2035f66906..4d9244aeba 100644 --- a/src/com/android/settings/users/EditUserInfoController.java +++ b/src/com/android/settings/users/EditUserInfoController.java @@ -34,16 +34,16 @@ import android.view.WindowManager; import android.widget.EditText; import android.widget.ImageView; +import androidx.annotation.VisibleForTesting; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settingslib.Utils; import com.android.settingslib.drawable.CircleFramedDrawable; import java.io.File; -import androidx.appcompat.app.AlertDialog; -import androidx.annotation.VisibleForTesting; -import androidx.fragment.app.Fragment; - /** * This class encapsulates a Dialog for editing the user nickname and photo. */ diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java index 4685bb15b3..f7d7e8633c 100644 --- a/src/com/android/settings/users/EditUserPhotoController.java +++ b/src/com/android/settings/users/EditUserPhotoController.java @@ -48,6 +48,9 @@ import android.widget.ImageView; import android.widget.ListPopupWindow; import android.widget.TextView; +import androidx.core.content.FileProvider; +import androidx.fragment.app.Fragment; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.drawable.CircleFramedDrawable; @@ -63,9 +66,6 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.List; -import androidx.core.content.FileProvider; -import androidx.fragment.app.Fragment; - public class EditUserPhotoController { private static final String TAG = "EditUserPhotoController"; diff --git a/src/com/android/settings/users/MultiUserFooterPreferenceController.java b/src/com/android/settings/users/MultiUserFooterPreferenceController.java index f42f1909d9..1573bbd08d 100644 --- a/src/com/android/settings/users/MultiUserFooterPreferenceController.java +++ b/src/com/android/settings/users/MultiUserFooterPreferenceController.java @@ -18,14 +18,14 @@ package com.android.settings.users; import android.content.Context; +import androidx.annotation.VisibleForTesting; +import androidx.preference.Preference; + import com.android.settings.R; import com.android.settings.core.BasePreferenceController; import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreferenceMixinCompat; -import androidx.annotation.VisibleForTesting; -import androidx.preference.Preference; - public class MultiUserFooterPreferenceController extends BasePreferenceController { @VisibleForTesting diff --git a/src/com/android/settings/users/OwnerInfoSettings.java b/src/com/android/settings/users/OwnerInfoSettings.java index 7576917fd2..8915a27560 100644 --- a/src/com/android/settings/users/OwnerInfoSettings.java +++ b/src/com/android/settings/users/OwnerInfoSettings.java @@ -26,15 +26,15 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.Fragment; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.widget.LockPatternUtils; import com.android.settings.R; import com.android.settings.core.instrumentation.InstrumentedDialogFragment; import com.android.settings.security.OwnerInfoPreferenceController.OwnerInfoCallback; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.Fragment; - public class OwnerInfoSettings extends InstrumentedDialogFragment implements OnClickListener { private static final String TAG_OWNER_INFO = "ownerInfo"; diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java index 80f493f261..65868e9653 100644 --- a/src/com/android/settings/users/UserDetailsSettings.java +++ b/src/com/android/settings/users/UserDetailsSettings.java @@ -24,6 +24,9 @@ import android.os.Bundle; import android.os.UserHandle; import android.os.UserManager; +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; @@ -32,9 +35,6 @@ import com.android.settingslib.RestrictedLockUtils; import java.util.List; -import androidx.preference.Preference; -import androidx.preference.SwitchPreference; - /** * Settings screen for configuring a specific user. It can contain user restrictions * and deletion controls. It is shown when you tap on the settings icon in the diff --git a/src/com/android/settings/users/UserDialogs.java b/src/com/android/settings/users/UserDialogs.java index 137c938cae..2361e449a7 100644 --- a/src/com/android/settings/users/UserDialogs.java +++ b/src/com/android/settings/users/UserDialogs.java @@ -30,11 +30,11 @@ import android.view.View; import android.widget.ImageView; import android.widget.TextView; +import androidx.appcompat.app.AlertDialog; + import com.android.settings.R; import com.android.settings.Utils; -import androidx.appcompat.app.AlertDialog; - /** * Helper class for displaying dialogs related to user settings. */ diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java index 544dd72f17..bcc0167507 100644 --- a/src/com/android/settings/users/UserPreference.java +++ b/src/com/android/settings/users/UserPreference.java @@ -25,14 +25,14 @@ import android.view.View; import android.view.View.OnClickListener; import android.widget.ImageView; +import androidx.preference.PreferenceViewHolder; + import com.android.settings.R; import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedPreference; import java.util.Comparator; -import androidx.preference.PreferenceViewHolder; - public class UserPreference extends RestrictedPreference { private static final int ALPHA_ENABLED = 255; private static final int ALPHA_DISABLED = 102; |