PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder and clean up imports.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/applications/assist/AssistContextPreferenceController.java
View File

@@ -20,9 +20,6 @@ import android.content.Context;
import android.net.Uri;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.app.AssistUtils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -35,6 +32,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.Arrays;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
public class AssistContextPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {

7
src/com/android/settings/applications/assist/AssistFlashScreenPreferenceController.java
View File

@@ -21,9 +21,6 @@ import android.content.Context;
import android.net.Uri;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.AssistUtils;
@@ -37,6 +34,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.Arrays;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
public class AssistFlashScreenPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {

7
src/com/android/settings/applications/assist/AssistScreenshotPreferenceController.java
View File

@@ -20,9 +20,6 @@ import android.content.Context;
import android.net.Uri;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
import com.android.internal.app.AssistUtils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -35,6 +32,10 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.Arrays;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.TwoStatePreference;
public class AssistScreenshotPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
LifecycleObserver, OnResume, OnPause {

3
src/com/android/settings/applications/assist/AssistSettingObserver.java
View File

@@ -20,12 +20,13 @@ import android.content.ContentResolver;
import android.database.ContentObserver;
import android.net.Uri;
import android.provider.Settings;
import androidx.annotation.MainThread;
import com.android.settingslib.utils.ThreadUtils;
import java.util.List;
import androidx.annotation.MainThread;
public abstract class AssistSettingObserver extends ContentObserver {
private final Uri ASSIST_URI =

1
src/com/android/settings/applications/assist/DefaultAssistPicker.java
View File

@@ -32,7 +32,6 @@ import com.android.internal.app.AssistUtils;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAppPickerFragment;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.CandidateInfo;

3
src/com/android/settings/applications/assist/DefaultAssistPreferenceController.java
View File

@@ -23,7 +23,6 @@ import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.service.voice.VoiceInteractionService;
import android.service.voice.VoiceInteractionServiceInfo;
import androidx.annotation.VisibleForTesting;
import com.android.internal.app.AssistUtils;
import com.android.settings.R;
@@ -32,6 +31,8 @@ import com.android.settingslib.applications.DefaultAppInfo;
import java.util.List;
import androidx.annotation.VisibleForTesting;
public class DefaultAssistPreferenceController extends DefaultAppPreferenceController {
private final AssistUtils mAssistUtils;

5
src/com/android/settings/applications/assist/DefaultVoiceInputPreferenceController.java
View File

@@ -20,8 +20,6 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.app.AssistUtils;
@@ -34,6 +32,9 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class DefaultVoiceInputPreferenceController extends DefaultAppPreferenceController
implements LifecycleObserver, OnResume, OnPause {