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

3
src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
View File

@@ -21,7 +21,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import androidx.preference.Preference;
import android.text.TextUtils;
import com.android.settings.R;
@@ -29,6 +28,8 @@ import com.android.settings.Utils;
import com.android.settings.core.SubSettingLauncher;
import com.android.settings.password.ChooseLockGeneric;
import androidx.preference.Preference;
public class ChangeProfileScreenLockPreferenceController extends
ChangeScreenLockPreferenceController {

5
src/com/android/settings/security/ChangeScreenLockPreferenceController.java
View File

@@ -21,8 +21,6 @@ import android.content.Context;
import android.os.UserHandle;
import android.os.UserManager;
import android.os.storage.StorageManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.widget.LockPatternUtils;
@@ -38,6 +36,9 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class ChangeScreenLockPreferenceController extends AbstractPreferenceController implements
PreferenceControllerMixin, GearPreference.OnGearClickListener {

3
src/com/android/settings/security/ConfigureKeyGuardDialog.java
View File

@@ -23,7 +23,6 @@ import android.app.admin.DevicePolicyManager;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.CredentialStorage;
@@ -31,6 +30,8 @@ import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settings.password.ChooseLockGeneric;
import androidx.annotation.VisibleForTesting;
/**
* Prompt for key guard configuration confirmation.
*/

3
src/com/android/settings/security/CredentialStoragePreferenceController.java
View File

@@ -19,10 +19,11 @@ package com.android.settings.security;
import android.content.Context;
import android.os.UserManager;
import android.security.KeyStore;
import androidx.preference.Preference;
import com.android.settings.R;
import androidx.preference.Preference;
public class CredentialStoragePreferenceController extends
RestrictedEncryptionPreferenceController {

3
src/com/android/settings/security/CryptKeeperSettings.java
View File

@@ -28,7 +28,6 @@ import android.os.BatteryManager;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.storage.StorageManager;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -43,6 +42,8 @@ import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.password.ChooseLockSettingsHelper;
import com.android.settings.password.ConfirmLockPattern;
import androidx.preference.Preference;
public class CryptKeeperSettings extends InstrumentedPreferenceFragment {
private static final String TAG = "CryptKeeper";
private static final String TYPE = "type";

3
src/com/android/settings/security/EncryptionStatusPreferenceController.java
View File

@@ -18,13 +18,14 @@ package com.android.settings.security;
import android.content.Context;
import android.os.UserManager;
import androidx.preference.Preference;
import android.text.TextUtils;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import androidx.preference.Preference;
public class EncryptionStatusPreferenceController extends BasePreferenceController {

5
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -27,8 +27,6 @@ import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -42,6 +40,9 @@ import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class LockUnificationPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

9
src/com/android/settings/security/OwnerInfoPreferenceController.java
View File

@@ -18,10 +18,6 @@ package com.android.settings.security;
import android.app.Fragment;
import android.content.Context;
import android.os.UserHandle;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.PreferenceControllerMixin;
@@ -34,6 +30,11 @@ import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceClickListener;
import androidx.preference.PreferenceScreen;
public class OwnerInfoPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnResume {

3
src/com/android/settings/security/ResetCredentialsPreferenceController.java
View File

@@ -19,13 +19,14 @@ package com.android.settings.security;
import android.content.Context;
import android.os.UserManager;
import android.security.KeyStore;
import androidx.preference.PreferenceScreen;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnResume;
import androidx.preference.PreferenceScreen;
public class ResetCredentialsPreferenceController extends RestrictedEncryptionPreferenceController
implements LifecycleObserver, OnResume {

9
src/com/android/settings/security/ScreenPinningSettings.java
View File

@@ -22,10 +22,6 @@ import android.os.Bundle;
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import androidx.preference.SwitchPreference;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -45,6 +41,11 @@ import com.android.settingslib.search.SearchIndexable;
import java.util.Arrays;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.Preference.OnPreferenceChangeListener;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
/**
* Screen pinning settings.
*/

2
src/com/android/settings/security/ShowPasswordPreferenceController.java
View File

@@ -21,9 +21,9 @@ import android.os.UserHandle;
import android.provider.Settings;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.core.TogglePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.R;
public class ShowPasswordPreferenceController extends TogglePreferenceController {

5
src/com/android/settings/security/SimLockPreferenceController.java
View File

@@ -19,8 +19,6 @@ package com.android.settings.security;
import android.content.Context;
import android.os.PersistableBundle;
import android.os.UserManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import android.telephony.CarrierConfigManager;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
@@ -30,6 +28,9 @@ import com.android.settings.core.BasePreferenceController;
import java.util.List;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
public class SimLockPreferenceController extends BasePreferenceController {
private static final String KEY_SIM_LOCK = "sim_lock_settings";

3
src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
View File

@@ -22,7 +22,6 @@ import android.app.admin.DevicePolicyManager;
import android.content.Context;
import android.os.UserHandle;
import android.provider.Settings;
import androidx.preference.Preference;
import android.text.TextUtils;
import android.util.Log;
@@ -35,6 +34,8 @@ import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
public class LockAfterTimeoutPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

5
src/com/android/settings/security/screenlock/PatternVisiblePreferenceController.java
View File

@@ -18,13 +18,14 @@ package com.android.settings.security.screenlock;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
public class PatternVisiblePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

5
src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
View File

@@ -18,8 +18,6 @@ package com.android.settings.security.screenlock;
import android.app.admin.DevicePolicyManager;
import android.content.Context;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
import android.text.TextUtils;
import com.android.internal.widget.LockPatternUtils;
@@ -29,6 +27,9 @@ import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.trustagent.TrustAgentManager;
import com.android.settingslib.core.AbstractPreferenceController;
import androidx.preference.Preference;
import androidx.preference.TwoStatePreference;
public class PowerButtonInstantLockPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {

5
src/com/android/settings/security/trustagent/ManageTrustAgentsPreferenceController.java
View File

@@ -18,8 +18,6 @@ package com.android.settings.security.trustagent;
import android.content.Context;
import android.os.UserHandle;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
@@ -27,6 +25,9 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.security.SecurityFeatureProvider;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
public class ManageTrustAgentsPreferenceController extends BasePreferenceController {
@VisibleForTesting

9
src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
View File

@@ -23,10 +23,6 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserHandle;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
import android.text.TextUtils;
import com.android.internal.widget.LockPatternUtils;
@@ -46,6 +42,11 @@ import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
import java.util.List;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
public class TrustAgentListPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, LifecycleObserver, OnSaveInstanceState,
OnCreate, OnResume {

3
src/com/android/settings/security/trustagent/TrustAgentManager.java
View File

@@ -29,7 +29,6 @@ import android.content.res.TypedArray;
import android.content.res.XmlResourceParser;
import android.os.UserHandle;
import android.service.trust.TrustAgentService;
import androidx.annotation.VisibleForTesting;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
@@ -46,6 +45,8 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.VisibleForTesting;
/** A manager for trust agent state. */
public class TrustAgentManager {