Sort imports

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

Test: rebuild
Change-Id: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
This commit is contained in:
Fan Zhang
2018-08-28 15:11:40 -07:00
parent 61a909c662
commit 23f8d59d02
1483 changed files with 4655 additions and 3953 deletions

View File

@@ -19,11 +19,11 @@ package com.android.settings.deviceinfo.firmwareversion;
import android.content.Context;
import android.os.SystemProperties;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
import androidx.annotation.VisibleForTesting;
public class BasebandVersionDialogController {
@VisibleForTesting

View File

@@ -19,10 +19,10 @@ package com.android.settings.deviceinfo.firmwareversion;
import android.os.Build;
import android.text.BidiFormatter;
import com.android.settings.R;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
public class BuildNumberDialogController {
@VisibleForTesting

View File

@@ -25,11 +25,11 @@ import android.os.UserManager;
import android.util.Log;
import android.view.View;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settingslib.RestrictedLockUtils;
import androidx.annotation.VisibleForTesting;
public class FirmwareVersionDialogController implements View.OnClickListener {
private static final String TAG = "firmwareDialogCtrl";

View File

@@ -22,14 +22,14 @@ import android.view.LayoutInflater;
import android.view.View;
import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
public class FirmwareVersionDialogFragment extends InstrumentedDialogFragment {
private static final String TAG = "firmwareVersionDialog";

View File

@@ -20,11 +20,11 @@ import android.content.Context;
import android.os.Build;
import android.text.TextUtils;
import com.android.settings.core.BasePreferenceController;
import androidx.fragment.app.Fragment;
import androidx.preference.Preference;
import com.android.settings.core.BasePreferenceController;
public class FirmwareVersionPreferenceController extends BasePreferenceController {
private Fragment mFragment;

View File

@@ -16,11 +16,11 @@
package com.android.settings.deviceinfo.firmwareversion;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settingslib.DeviceInfoUtils;
import androidx.annotation.VisibleForTesting;
public class KernelVersionDialogController {
@VisibleForTesting

View File

@@ -24,11 +24,11 @@ import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import androidx.annotation.VisibleForTesting;
import com.android.settings.R;
import com.android.settingslib.DeviceInfoUtils;
import androidx.annotation.VisibleForTesting;
public class SecurityPatchLevelDialogController implements View.OnClickListener {
private static final String TAG = "SecurityPatchCtrl";