Reorder and clean up imports.

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
This commit is contained in:
Fan Zhang
2018-06-18 15:21:41 -07:00
parent 2c6cccb90c
commit c7162cd24d
1315 changed files with 3688 additions and 3126 deletions

View File

@@ -13,21 +13,21 @@
*/
package com.android.settings.display;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
import android.content.Context;
import android.content.Intent;
import android.provider.Settings;
import android.text.TextUtils;
import com.android.settings.DisplaySettings;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.search.DatabaseIndexingUtils;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.search.ResultPayload;
import com.android.settings.R;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
public class AutoBrightnessPreferenceController extends TogglePreferenceController {

View File

@@ -14,7 +14,6 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.Preference;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
@@ -27,6 +26,8 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.Preference;
public class AutoRotatePreferenceController extends TogglePreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener, LifecycleObserver,
OnResume, OnPause {

View File

@@ -15,15 +15,16 @@
*/
package com.android.settings.display;
import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
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.core.AbstractPreferenceController;
import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
/**
* A controller to manage the switch for showing battery percentage in the status bar.

View File

@@ -28,9 +28,6 @@ import android.os.ServiceManager;
import android.provider.Settings;
import android.provider.Settings.System;
import android.service.vr.IVrManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.util.Log;
import com.android.settings.core.PreferenceControllerMixin;
@@ -42,6 +39,10 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
import java.text.NumberFormat;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class BrightnessLevelPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {

View File

@@ -13,16 +13,17 @@
*/
package com.android.settings.display;
import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
import android.content.Context;
import android.os.SystemProperties;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import static android.provider.Settings.Secure.CAMERA_GESTURE_DISABLED;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
public class CameraGesturePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

View File

@@ -17,14 +17,10 @@ import android.content.Context;
import android.graphics.drawable.Drawable;
import android.provider.SearchIndexableResource;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settings.widget.RadioButtonPickerFragment;
@@ -35,6 +31,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceScreen;
@SuppressWarnings("WeakerAccess")
@SearchIndexable
public class ColorModePreferenceFragment extends RadioButtonPickerFragment

View File

@@ -29,6 +29,7 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.android.settings.R;
/**

View File

@@ -26,8 +26,8 @@ import android.view.View;
import android.widget.EditText;
import com.android.settings.R;
import com.android.settingslib.CustomEditTextPreference;
import com.android.settings.Utils;
import com.android.settingslib.CustomEditTextPreference;
import com.android.settingslib.display.DisplayDensityUtils;
import java.text.NumberFormat;

View File

@@ -13,17 +13,18 @@
*/
package com.android.settings.display;
import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;
import android.content.Context;
import android.hardware.Sensor;
import android.hardware.SensorManager;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import static android.provider.Settings.Secure.WAKE_GESTURE_ENABLED;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
public class LiftToWakePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

View File

@@ -17,17 +17,19 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.applications.LayoutPreference;
import com.android.settings.core.TogglePreferenceController;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class NightDisplayActivationPreferenceController extends TogglePreferenceController {
private ColorDisplayController mController;

View File

@@ -17,13 +17,15 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.DropDownPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class NightDisplayAutoModePreferenceController extends BasePreferenceController
implements Preference.OnPreferenceChangeListener {

View File

@@ -17,10 +17,12 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
public class NightDisplayCustomEndTimePreferenceController extends BasePreferenceController {
private ColorDisplayController mController;

View File

@@ -17,10 +17,12 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
public class NightDisplayCustomStartTimePreferenceController extends BasePreferenceController {
private ColorDisplayController mController;

View File

@@ -17,12 +17,14 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.widget.FooterPreference;
import androidx.preference.Preference;
public class NightDisplayFooterPreferenceController extends BasePreferenceController {
public NightDisplayFooterPreferenceController(Context context) {

View File

@@ -16,9 +16,6 @@
package com.android.settings.display;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.content.Context;
import android.text.TextUtils;
@@ -26,6 +23,9 @@ import com.android.internal.app.ColorDisplayController;
import com.android.settings.core.SliderPreferenceController;
import com.android.settings.widget.SeekBarPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class NightDisplayIntensityPreferenceController extends SliderPreferenceController {
private ColorDisplayController mController;

View File

@@ -15,13 +15,14 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.SwitchPreference;
import android.util.AttributeSet;
import com.android.internal.app.ColorDisplayController;
import java.time.LocalTime;
import androidx.preference.SwitchPreference;
public class NightDisplayPreference extends SwitchPreference
implements ColorDisplayController.Callback {

View File

@@ -16,9 +16,9 @@ package com.android.settings.display;
import android.content.Context;
import com.android.internal.app.ColorDisplayController;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settings.R;
public class NightDisplayPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {

View File

@@ -21,7 +21,6 @@ import android.app.TimePickerDialog;
import android.content.Context;
import android.os.Bundle;
import android.provider.SearchIndexableResource;
import androidx.preference.Preference;
import com.android.internal.app.ColorDisplayController;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -36,6 +35,8 @@ import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
import androidx.preference.Preference;
/**
* Settings screen for Night display.
*/

View File

@@ -17,14 +17,15 @@ import static android.content.Context.UI_MODE_SERVICE;
import android.app.UiModeManager;
import android.content.Context;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.util.Log;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class NightModePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

View File

@@ -14,12 +14,13 @@
package com.android.settings.display;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.dream.DreamSettings;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class ScreenSaverPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {

View File

@@ -17,13 +17,14 @@
package com.android.settings.display;
import android.content.Context;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.AttributeSet;
import com.android.settingslib.display.DisplayDensityUtils;
import androidx.core.content.res.TypedArrayUtils;
import androidx.preference.Preference;
/**
* Preference for changing the density of the display on which the preference
* is visible.

View File

@@ -15,13 +15,14 @@ package com.android.settings.display;
import android.content.Context;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
public class ShowOperatorNamePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

View File

@@ -15,12 +15,13 @@ package com.android.settings.display;
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.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
public class TapToWakePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

View File

@@ -20,7 +20,6 @@ import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
import androidx.preference.Preference;
import android.util.Log;
import com.android.settings.R;
@@ -30,6 +29,8 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class TimeoutPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

View File

@@ -17,12 +17,13 @@ import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.Settings;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class VrDisplayPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {

View File

@@ -13,13 +13,14 @@
*/
package com.android.settings.display;
import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserHandle;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
@@ -29,10 +30,10 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
import java.util.List;
import androidx.preference.Preference;
public class WallpaperPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {