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

Commit f7802eac 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: I9acb311ec05f72f0a37f08b0d26785841fe91de5
parent 84f7d7b3

packages/SettingsLib/src/com/android/settingslib/CustomDialogPreference.java

+3 −2
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ import android.app.Dialog; 
import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;

import androidx.preference.PreferenceDialogFragment;

import androidx.preference.DialogPreference;

import android.util.AttributeSet;

import android.view.View;



import androidx.preference.DialogPreference;

import androidx.preference.PreferenceDialogFragment;



public class CustomDialogPreference extends DialogPreference {



    private CustomPreferenceDialogFragment mFragment;

packages/SettingsLib/src/com/android/settingslib/CustomEditTextPreference.java

+4 −3
Original line number Diff line number Diff line
@@ -23,13 +23,14 @@ import android.app.Dialog; 
import android.content.Context;

import android.content.DialogInterface;

import android.os.Bundle;

import androidx.annotation.CallSuper;

import androidx.preference.EditTextPreferenceDialogFragment;

import androidx.preference.EditTextPreference;

import android.util.AttributeSet;

import android.view.View;

import android.widget.EditText;



import androidx.annotation.CallSuper;

import androidx.preference.EditTextPreference;

import androidx.preference.EditTextPreferenceDialogFragment;



public class CustomEditTextPreference extends EditTextPreference {



    private CustomPreferenceDialogFragment mFragment;

packages/SettingsLib/src/com/android/settingslib/DeviceInfoUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.settingslib;



import static android.content.Context.TELEPHONY_SERVICE;



import android.content.Context;

import android.content.Intent;

import android.content.pm.ApplicationInfo;
@@ -30,6 +32,7 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.text.format.DateFormat;

import android.util.Log;



import androidx.annotation.VisibleForTesting;



import java.io.BufferedReader;
@@ -43,8 +46,6 @@ import java.util.Locale; 
import java.util.regex.Matcher;

import java.util.regex.Pattern;



import static android.content.Context.TELEPHONY_SERVICE;



public class DeviceInfoUtils {

    private static final String TAG = "DeviceInfoUtils";

packages/SettingsLib/src/com/android/settingslib/HelpUtils.java

+1 −2
Original line number Diff line number Diff line
@@ -24,16 +24,15 @@ import android.content.Intent; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager.NameNotFoundException;

import android.content.res.Resources;

import android.content.res.Resources.Theme;

import android.content.res.TypedArray;

import android.net.Uri;

import android.provider.Settings.Global;

import android.text.TextUtils;

import android.util.Log;

import android.util.TypedValue;

import android.view.Menu;

import android.view.MenuItem;

import android.view.MenuItem.OnMenuItemClickListener;



import com.android.internal.logging.MetricsLogger;

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

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import android.os.RemoteException; 
import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import androidx.annotation.VisibleForTesting;

import android.text.SpannableStringBuilder;

import android.text.Spanned;

import android.text.style.ForegroundColorSpan;
@@ -43,6 +42,8 @@ import android.text.style.ImageSpan; 
import android.view.MenuItem;

import android.widget.TextView;



import androidx.annotation.VisibleForTesting;



import com.android.internal.widget.LockPatternUtils;



import java.util.List;