Merge "Fixes import ordering." (f866003a) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/keyguard/CarrierText.java

+4 −5

Original line number	Original line	Diff line number	Diff line
	@@ -16,10 +16,6 @@

	package com.android.keyguard;		package com.android.keyguard;

	import java.util.List;
	import java.util.Locale;
	import java.util.Objects;

	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.IntentFilter;		import android.content.IntentFilter;
	@@ -28,6 +24,7 @@ import android.net.ConnectivityManager;
	import android.net.wifi.WifiManager;		import android.net.wifi.WifiManager;
	import android.telephony.ServiceState;		import android.telephony.ServiceState;
	import android.telephony.SubscriptionInfo;		import android.telephony.SubscriptionInfo;
			import android.telephony.TelephonyManager;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.text.method.SingleLineTransformationMethod;		import android.text.method.SingleLineTransformationMethod;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	@@ -40,7 +37,9 @@ import com.android.internal.telephony.IccCardConstants.State;
	import com.android.internal.telephony.TelephonyIntents;		import com.android.internal.telephony.TelephonyIntents;
	import com.android.settingslib.WirelessUtils;		import com.android.settingslib.WirelessUtils;

	import android.telephony.TelephonyManager;		import java.util.List;
			import java.util.Locale;
			import java.util.Objects;

	public class CarrierText extends TextView {		public class CarrierText extends TextView {
	private static final boolean DEBUG = KeyguardConstants.DEBUG;		private static final boolean DEBUG = KeyguardConstants.DEBUG;

packages/SystemUI/src/com/android/keyguard/EmergencyButton.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package com.android.keyguard;		package com.android.keyguard;

	import android.app.ActivityManager;
	import android.app.ActivityOptions;		import android.app.ActivityOptions;
	import android.app.ActivityTaskManager;		import android.app.ActivityTaskManager;
	import android.content.Context;		import android.content.Context;
	@@ -37,8 +36,8 @@ import android.widget.Button;
	import com.android.internal.logging.MetricsLogger;		import com.android.internal.logging.MetricsLogger;
	import com.android.internal.logging.nano.MetricsProto.MetricsEvent;		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
	import com.android.internal.telephony.IccCardConstants.State;		import com.android.internal.telephony.IccCardConstants.State;
	import com.android.internal.widget.LockPatternUtils;
	import com.android.internal.util.EmergencyAffordanceManager;		import com.android.internal.util.EmergencyAffordanceManager;
			import com.android.internal.widget.LockPatternUtils;
	import com.android.systemui.util.EmergencyDialerConstants;		import com.android.systemui.util.EmergencyDialerConstants;

	/**		/**

packages/SystemUI/src/com/android/keyguard/KeyguardEsimArea.java

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -22,19 +22,15 @@ import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	import android.content.IntentFilter;		import android.content.IntentFilter;
	import android.os.Handler;
	import android.os.HandlerThread;
	import android.os.UserHandle;		import android.os.UserHandle;
			import android.telephony.SubscriptionInfo;
			import android.telephony.SubscriptionManager;
			import android.telephony.euicc.EuiccManager;
	import android.util.AttributeSet;		import android.util.AttributeSet;
			import android.util.Log;
	import android.view.View;		import android.view.View;
	import android.view.WindowManager;		import android.view.WindowManager;
	import android.widget.Button;		import android.widget.Button;
	import android.telephony.SubscriptionManager;
	import android.telephony.SubscriptionInfo;
	import android.telephony.euicc.EuiccManager;
	import android.util.Log;

	import java.lang.ref.WeakReference;

	/***		/***
	* This button is used by the device with embedded SIM card to disable current carrier to unlock		* This button is used by the device with embedded SIM card to disable current carrier to unlock

packages/SystemUI/src/com/android/keyguard/KeyguardHostView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,8 @@ package com.android.keyguard;
	import android.app.Activity;		import android.app.Activity;
	import android.app.ActivityManager;		import android.app.ActivityManager;
	import android.content.Context;		import android.content.Context;
	import android.content.res.Resources;
	import android.content.res.ColorStateList;		import android.content.res.ColorStateList;
			import android.content.res.Resources;
	import android.graphics.Canvas;		import android.graphics.Canvas;
	import android.media.AudioManager;		import android.media.AudioManager;
	import android.os.SystemClock;		import android.os.SystemClock;

packages/SystemUI/src/com/android/keyguard/KeyguardPinBasedInputView.java

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -23,8 +23,6 @@ import android.view.KeyEvent;
	import android.view.MotionEvent;		import android.view.MotionEvent;
	import android.view.View;		import android.view.View;

	import com.android.internal.annotations.VisibleForTesting;

	/**		/**
	* A Pin based Keyguard input view		* A Pin based Keyguard input view
	*/		*/