Reorder and clean up imports.
Test: rebuild Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
This commit is contained in:
@@ -26,7 +26,6 @@ import android.graphics.drawable.Drawable;
|
||||
import android.os.Process;
|
||||
import android.os.UserHandle;
|
||||
import android.os.UserManager;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import android.util.IconDrawableFactory;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
@@ -34,15 +33,17 @@ import android.view.ViewGroup;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.Settings;
|
||||
import com.android.settings.Utils;
|
||||
import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminAdd;
|
||||
import com.android.settingslib.RestrictedLockUtils;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
/**
|
||||
* Helper class for {@link ActionDisabledByAdminDialog} which sets up the dialog.
|
||||
*/
|
||||
|
||||
@@ -15,7 +15,6 @@
|
||||
package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.preference.Preference;
|
||||
import android.text.format.DateUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
@@ -25,6 +24,8 @@ import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
|
||||
public abstract class AdminActionPreferenceControllerBase extends
|
||||
AbstractPreferenceController implements PreferenceControllerMixin {
|
||||
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||
@@ -24,6 +23,8 @@ 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 {
|
||||
|
||||
|
||||
@@ -14,13 +14,14 @@
|
||||
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 {
|
||||
|
||||
|
||||
@@ -18,8 +18,6 @@ package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.pm.PackageManager;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import android.util.IconDrawableFactory;
|
||||
|
||||
import com.android.settings.SettingsPreferenceFragment;
|
||||
@@ -31,6 +29,9 @@ 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.
|
||||
|
||||
@@ -15,11 +15,12 @@
|
||||
package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
public class CaCertsCurrentUserPreferenceController extends CaCertsPreferenceControllerBase {
|
||||
|
||||
@VisibleForTesting
|
||||
|
||||
@@ -15,6 +15,7 @@
|
||||
package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
public class CaCertsManagedProfilePreferenceController extends CaCertsPreferenceControllerBase {
|
||||
|
||||
@@ -15,13 +15,14 @@
|
||||
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 {
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@
|
||||
package com.android.settings.enterprise;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.applications.ApplicationFeatureProvider;
|
||||
@@ -22,6 +21,8 @@ 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 {
|
||||
|
||||
|
||||
@@ -14,13 +14,14 @@
|
||||
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 {
|
||||
|
||||
|
||||
@@ -21,10 +21,6 @@ import android.content.pm.ApplicationInfo;
|
||||
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;
|
||||
@@ -42,6 +38,11 @@ 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.
|
||||
|
||||
@@ -16,7 +16,6 @@ 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;
|
||||
@@ -26,6 +25,8 @@ 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 {
|
||||
|
||||
|
||||
@@ -15,13 +15,14 @@
|
||||
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 {
|
||||
|
||||
|
||||
@@ -15,13 +15,14 @@
|
||||
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 {
|
||||
|
||||
|
||||
@@ -19,7 +19,6 @@ import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
import androidx.preference.Preference;
|
||||
|
||||
public class ManageDeviceAdminPreferenceController extends BasePreferenceController {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user