Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7162cd2 authored by Fan Zhang's avatar Fan Zhang
Browse files

Reorder and clean up imports. 

Test: rebuild
Change-Id: I178485c84ae7146f991fd77b6d7504b029942a68
parent 2c6cccb9

src/com/android/settings/AccessiblePreferenceCategory.java

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import android.content.Context;



import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceViewHolder;

src/com/android/settings/BrightnessPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -19,9 +19,10 @@ package com.android.settings; 
import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;

import androidx.preference.Preference;

import android.util.AttributeSet;



import androidx.preference.Preference;



public class BrightnessPreference extends Preference {



    public BrightnessPreference(Context context, AttributeSet attrs) {

src/com/android/settings/CancellablePreference.java

+3 −2
Original line number Diff line number Diff line
@@ -16,13 +16,14 @@ 
package com.android.settings;



import android.content.Context;

import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;

import android.util.AttributeSet;

import android.view.View;

import android.view.View.OnClickListener;

import android.widget.ImageView;



import androidx.preference.Preference;

import androidx.preference.PreferenceViewHolder;



public class CancellablePreference extends Preference implements OnClickListener {



    private boolean mCancellable;

src/com/android/settings/CredentialStorage.java

+3 −0
Original line number Diff line number Diff line
@@ -38,14 +38,17 @@ import android.security.KeyStore; 
import android.text.TextUtils;

import android.util.Log;

import android.widget.Toast;



import com.android.internal.widget.LockPatternUtils;

import com.android.org.bouncycastle.asn1.ASN1InputStream;

import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;

import com.android.settings.password.ChooseLockSettingsHelper;

import com.android.settings.security.ConfigureKeyGuardDialog;

import com.android.settings.vpn2.VpnUtils;



import java.io.ByteArrayInputStream;

import java.io.IOException;



import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;

src/com/android/settings/CustomListPreference.java

+3 −2
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ import android.content.DialogInterface; 
import android.content.DialogInterface.OnClickListener;

import android.content.Intent;

import android.os.Bundle;

import androidx.preference.ListPreferenceDialogFragment;

import androidx.preference.ListPreference;

import android.util.AttributeSet;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.core.instrumentation.InstrumentedDialogFragment;



import androidx.preference.ListPreference;

import androidx.preference.ListPreferenceDialogFragment;



public class CustomListPreference extends ListPreference {



    public CustomListPreference(Context context, AttributeSet attrs) {