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

Commit 23f8d59d authored by Fan Zhang's avatar Fan Zhang
Browse files

Sort imports 

Having consistent import order will reduce chance of merge
conflict between internal and external master

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
parent 61a909c6

src/com/android/settings/AllowBindAppWidgetActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ import android.util.Log; 
import android.view.LayoutInflater;

import android.widget.CheckBox;



import androidx.appcompat.app.AlertDialog;



import com.android.internal.app.AlertActivity;

import com.android.internal.app.AlertController;



import androidx.appcompat.app.AlertDialog;



/**

 * This activity is displayed when an app launches the BIND_APPWIDGET intent. This allows apps

 * that don't have the BIND_APPWIDGET permission to bind specific widgets.

src/com/android/settings/BandMode.java

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ import android.widget.AdapterView; 
import android.widget.ArrayAdapter;

import android.widget.ListView;



import androidx.appcompat.app.AlertDialog;



import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneFactory;



import androidx.appcompat.app.AlertDialog;



/**

 * Radio Band Mode Selection Class

 *

src/com/android/settings/BugreportPreference.java

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ import android.view.View; 
import android.widget.CheckedTextView;

import android.widget.TextView;



import androidx.appcompat.app.AlertDialog.Builder;



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

import com.android.settings.overlay.FeatureFactory;

import com.android.settingslib.CustomDialogPreferenceCompat;



import androidx.appcompat.app.AlertDialog.Builder;



public class BugreportPreference extends CustomDialogPreferenceCompat {



    private static final String TAG = "BugreportPreference";

src/com/android/settings/CredentialStorage.java

+3 −2
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ import android.text.TextUtils; 
import android.util.Log;

import android.widget.Toast;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentActivity;



import com.android.internal.widget.LockPatternUtils;

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

import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -48,8 +51,6 @@ import com.android.settings.vpn2.VpnUtils; 
import java.io.ByteArrayInputStream;

import java.io.IOException;



import androidx.appcompat.app.AlertDialog;

import androidx.fragment.app.FragmentActivity;

import sun.security.util.ObjectIdentifier;

import sun.security.x509.AlgorithmId;

src/com/android/settings/CustomListPreference.java

+3 −3
Original line number Diff line number Diff line
@@ -24,15 +24,15 @@ import android.content.Intent; 
import android.os.Bundle;

import android.util.AttributeSet;



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

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



import androidx.appcompat.app.AlertDialog.Builder;

import androidx.fragment.app.Fragment;

import androidx.fragment.app.FragmentTransaction;

import androidx.preference.ListPreference;

import androidx.preference.ListPreferenceDialogFragmentCompat;



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

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



public class CustomListPreference extends ListPreference {



    public CustomListPreference(Context context, AttributeSet attrs) {