Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2014-11-24 16:26:01 +00:00
committed by Android (Google) Code Review
parent 8a9242428b d05064b850
commit f510a8a688
4 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/Keyguard/res/layout/keyguard_sim_pin_view.xml
View File

@@ -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"/>

1
packages/Keyguard/res/layout/keyguard_sim_puk_view.xml
View File

@@ -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"/>

10
packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
View File

@@ -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

10
packages/Keyguard/src/com/android/keyguard/KeyguardSimPukView.java
View File

@@ -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