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

6
src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelper.java
View File

@@ -32,6 +32,9 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import com.android.settings.R;
import com.android.settings.Settings;
import com.android.settings.Utils;
@@ -41,9 +44,6 @@ import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import java.util.Objects;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
/**
* Helper class for {@link ActionDisabledByAdminDialog} which sets up the dialog.
*/

4
src/com/android/settings/enterprise/AdminActionPreferenceControllerBase.java
View File

@@ -17,6 +17,8 @@ package com.android.settings.enterprise;
import android.content.Context;
import android.text.format.DateUtils;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
@@ -24,8 +26,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.Date;
import androidx.preference.Preference;
public abstract class AdminActionPreferenceControllerBase extends
AbstractPreferenceController implements PreferenceControllerMixin {

4
src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
View File

@@ -17,14 +17,14 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public abstract class AdminGrantedPermissionsPreferenceControllerBase
extends AbstractPreferenceController implements PreferenceControllerMixin {

4
src/com/android/settings/enterprise/AlwaysOnVpnCurrentUserPreferenceController.java
View File

@@ -15,13 +15,13 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class AlwaysOnVpnCurrentUserPreferenceController
extends AbstractPreferenceController implements PreferenceControllerMixin {

6
src/com/android/settings/enterprise/ApplicationListPreferenceController.java
View File

@@ -20,6 +20,9 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.util.IconDrawableFactory;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.UserAppInfo;
@@ -29,9 +32,6 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
/**
* PreferenceController that builds a dynamic list of applications provided by
* {@link ApplicationListBuilder} instance.

4
src/com/android/settings/enterprise/CaCertsCurrentUserPreferenceController.java
View File

@@ -16,11 +16,11 @@ package com.android.settings.enterprise;
import android.content.Context;
import com.android.settings.R;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase {
@VisibleForTesting

4
src/com/android/settings/enterprise/CaCertsPreferenceControllerBase.java
View File

@@ -16,13 +16,13 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public abstract class CaCertsPreferenceControllerBase
extends AbstractPreferenceController implements PreferenceControllerMixin {

4
src/com/android/settings/enterprise/EnterpriseInstalledPackagesPreferenceController.java
View File

@@ -15,14 +15,14 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class EnterpriseInstalledPackagesPreferenceController
extends AbstractPreferenceController implements PreferenceControllerMixin {

4
src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
View File

@@ -15,13 +15,13 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class EnterprisePrivacyPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {

10
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -22,6 +22,11 @@ import android.content.pm.PackageManager;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.applications.ApplicationFeatureProvider;
@@ -38,11 +43,6 @@ import java.util.Collections;
import java.util.EnumMap;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
/**
* PreferenceController that builds a dynamic list of default apps set by device or profile owner.

4
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
View File

@@ -17,6 +17,8 @@ package com.android.settings.enterprise;
import android.content.Context;
import android.os.UserHandle;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.applications.EnterpriseDefaultApps;
@@ -25,8 +27,6 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.users.UserFeatureProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class EnterpriseSetDefaultAppsPreferenceController
extends AbstractPreferenceController implements PreferenceControllerMixin {

4
src/com/android/settings/enterprise/FailedPasswordWipePreferenceControllerBase.java
View File

@@ -16,13 +16,13 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public abstract class FailedPasswordWipePreferenceControllerBase
extends AbstractPreferenceController implements PreferenceControllerMixin {

4
src/com/android/settings/enterprise/ImePreferenceController.java
View File

@@ -16,13 +16,13 @@ package com.android.settings.enterprise;
import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class ImePreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin {