Sort imports

Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
This commit is contained in:
Fan Zhang
2018-08-28 15:11:40 -07:00
parent 61a909c662
commit 23f8d59d02
1483 changed files with 4655 additions and 3953 deletions

View File

@@ -25,10 +25,10 @@ import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import androidx.annotation.VisibleForTesting;
import com.android.internal.hardware.AmbientDisplayConfiguration;
public class DoubleTapScreenPreferenceController extends GesturePreferenceController {
private final int ON = 1;

View File

@@ -26,11 +26,11 @@ import android.os.UserManager;
import android.provider.Settings;
import android.text.TextUtils;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
import androidx.annotation.VisibleForTesting;
public class DoubleTwistPreferenceController extends GesturePreferenceController {
private final int ON = 1;

View File

@@ -19,6 +19,10 @@ package com.android.settings.gestures;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.widget.VideoPreference;
@@ -28,10 +32,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public abstract class GesturePreferenceController extends TogglePreferenceController
implements Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {

View File

@@ -20,6 +20,8 @@ import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import androidx.annotation.NonNull;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
@@ -29,8 +31,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
public class GesturesSettingPreferenceController extends BasePreferenceController {
private final AssistGestureFeatureProvider mFeatureProvider;
private List<AbstractPreferenceController> mGestureControllers;

View File

@@ -27,8 +27,6 @@ import android.text.TextUtils;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import androidx.annotation.VisibleForTesting;
public class PickupGesturePreferenceController extends GesturePreferenceController {
private static final int ON = 1;

View File

@@ -24,6 +24,11 @@ import android.content.Context;
import android.os.Bundle;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
@@ -31,11 +36,6 @@ import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import androidx.annotation.VisibleForTesting;
import androidx.preference.ListPreference;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class PreventRingingPreferenceController extends PreventRingingParentPreferenceController
implements Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause, OnCreate, OnSaveInstanceState {

View File

@@ -20,7 +20,6 @@ import static android.provider.Settings.Secure.DOZE_REACH_GESTURE;
import android.annotation.UserIdInt;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;