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

Sort imports

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

4
src/com/android/settings/backup/AutoRestorePreferenceController.java
View File

@@ -24,11 +24,11 @@ import android.os.ServiceManager;
import android.provider.Settings;
import android.util.Log;
import com.android.settings.core.TogglePreferenceController;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
import com.android.settings.core.TogglePreferenceController;
public class AutoRestorePreferenceController extends TogglePreferenceController {
private static final String TAG = "AutoRestorePrefCtrler";

4
src/com/android/settings/backup/BackupDataPreferenceController.java
View File

@@ -18,11 +18,11 @@ package com.android.settings.backup;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
public class BackupDataPreferenceController extends BasePreferenceController {
private PrivacySettingsConfigData mPSCD;

8
src/com/android/settings/backup/BackupSettingsActivity.java
View File

@@ -23,6 +23,10 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import com.android.settings.R;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
@@ -32,10 +36,6 @@ import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
/**
* The activity used to launch the configured Backup activity or the preference screen

4
src/com/android/settings/backup/BackupSettingsHelper.java
View File

@@ -26,13 +26,13 @@ import android.os.ServiceManager;
import android.os.UserHandle;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Settings.PrivacySettingsActivity;
import java.net.URISyntaxException;
import androidx.annotation.VisibleForTesting;
/**
* Helper class for {@link BackupSettingsActivity} that interacts with {@link IBackupManager}.
*/

6
src/com/android/settings/backup/BackupSettingsPreferenceController.java
View File

@@ -20,12 +20,12 @@ package com.android.settings.backup;
import android.content.Context;
import android.content.Intent;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public class BackupSettingsPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String BACKUP_SETTINGS = "backup_settings";

4
src/com/android/settings/backup/ConfigureAccountPreferenceController.java
View File

@@ -19,11 +19,11 @@ package com.android.settings.backup;
import android.content.Context;
import android.content.Intent;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
public class ConfigureAccountPreferenceController extends BasePreferenceController {
private PrivacySettingsConfigData mPSCD;

4
src/com/android/settings/backup/DataManagementPreferenceController.java
View File

@@ -18,10 +18,10 @@ package com.android.settings.backup;
import android.content.Context;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
public class DataManagementPreferenceController extends BasePreferenceController {
private PrivacySettingsConfigData mPSCD;

10
src/com/android/settings/backup/ToggleBackupSettingFragment.java
View File

@@ -12,6 +12,11 @@ import android.util.Log;
import android.view.View;
import android.widget.TextView;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
@@ -19,11 +24,6 @@ import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.ToggleSwitch;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
/**
* Fragment to display a bunch of text about backup and restore, and allow the user to enable/
* disable it.