am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev (fc4d8043) · Commits · e / os / android_frameworks_base

packages/Keyguard/res/layout/keyguard_sim_pin_view.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		android:contentDescription="@string/keyguard_accessibility_pin_unlock">

		<ImageView
		android:id="@+id/keyguard_sim"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_lockscreen_sim"/>

packages/Keyguard/res/layout/keyguard_sim_puk_view.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@
		android:gravity="center_horizontal">

		<ImageView
		android:id="@+id/keyguard_sim"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_lockscreen_sim"/>

packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -22,11 +22,13 @@ import com.android.internal.telephony.IccCardConstants.State;
		import com.android.internal.telephony.PhoneConstants;

		import android.content.Context;
		import android.content.res.ColorStateList;
		import android.content.res.Resources;
		import android.app.AlertDialog;
		import android.app.AlertDialog.Builder;
		import android.app.Dialog;
		import android.app.ProgressDialog;
		import android.graphics.Color;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.SubscriptionInfo;
		@@ -35,6 +37,7 @@ import android.telephony.TelephonyManager;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.WindowManager;
		import android.widget.ImageView;

		/**
		* Displays a PIN pad for unlocking.
		@@ -49,6 +52,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {

		private AlertDialog mRemainingAttemptsDialog;
		private int mSubId;
		private ImageView mSimImageView;

		KeyguardUpdateMonitorCallback mUpdateMonitorCallback = new KeyguardUpdateMonitorCallback() {
		@Override
		@@ -75,14 +79,19 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		int count = TelephonyManager.getDefault().getSimCount();
		Resources rez = getResources();
		final String msg;
		int color = Color.WHITE;
		if (count < 2) {
		msg = rez.getString(R.string.kg_sim_pin_instructions);
		} else {
		SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId);
		CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash
		msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName);
		if (info != null) {
		color = info.getIconTint();
		}
		}
		mSecurityMessageDisplay.setMessage(msg, true);
		mSimImageView.setImageTintList(ColorStateList.valueOf(color));
		}
		}

		@@ -122,6 +131,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
		if (mEcaView instanceof EmergencyCarrierArea) {
		((EmergencyCarrierArea) mEcaView).setCarrierTextVisible(true);
		}
		mSimImageView = (ImageView) findViewById(R.id.keyguard_sim);
		}

		@Override

packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -17,11 +17,13 @@
		package com.android.keyguard;

		import android.content.Context;
		import android.content.res.ColorStateList;
		import android.content.res.Resources;
		import android.app.Activity;
		import android.app.AlertDialog;
		import android.app.Dialog;
		import android.app.ProgressDialog;
		import android.graphics.Color;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.telephony.SubscriptionInfo;
		@@ -30,6 +32,7 @@ import android.telephony.TelephonyManager;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.view.WindowManager;
		import android.widget.ImageView;

		import com.android.internal.telephony.ITelephony;
		import com.android.internal.telephony.IccCardConstants;
		@@ -52,6 +55,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		private StateMachine mStateMachine = new StateMachine();
		private AlertDialog mRemainingAttemptsDialog;
		private int mSubId;
		private ImageView mSimImageView;

		KeyguardUpdateMonitorCallback mUpdateMonitorCallback = new KeyguardUpdateMonitorCallback() {
		@Override
		@@ -118,14 +122,19 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		int count = TelephonyManager.getDefault().getSimCount();
		Resources rez = getResources();
		final String msg;
		int color = Color.WHITE;
		if (count < 2) {
		msg = rez.getString(R.string.kg_puk_enter_puk_hint);
		} else {
		SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId);
		CharSequence displayName = info != null ? info.getDisplayName() : "";
		msg = rez.getString(R.string.kg_puk_enter_puk_hint_multi, displayName);
		if (info != null) {
		color = info.getIconTint();
		}
		}
		mSecurityMessageDisplay.setMessage(msg, true);
		mSimImageView.setImageTintList(ColorStateList.valueOf(color));
		}
		mPasswordEntry.requestFocus();
		}
		@@ -172,6 +181,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
		if (mEcaView instanceof EmergencyCarrierArea) {
		((EmergencyCarrierArea) mEcaView).setCarrierTextVisible(true);
		}
		mSimImageView = (ImageView) findViewById(R.id.keyguard_sim);
		}

		@Override