summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-09-24 00:23:47 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-24 00:23:47 +0000
commit05b11bf357be9546a2cbdd3f37c32fc9567f4767 (patch)
tree801ea84386caf09fc10f966a2f85260791526d02 /packages
parent6a15d528c0a4501389008ef945dec38b5ca6919a (diff)
parentad371b2e2215c76bc0f852dabc4ddb563c603af3 (diff)
downloadframeworks_base-05b11bf357be9546a2cbdd3f37c32fc9567f4767.zip
frameworks_base-05b11bf357be9546a2cbdd3f37c32fc9567f4767.tar.gz
frameworks_base-05b11bf357be9546a2cbdd3f37c32fc9567f4767.tar.bz2
Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
Diffstat (limited to 'packages')
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
index aeac912..2033159 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
@@ -23,6 +23,7 @@ import com.android.internal.telephony.PhoneConstants;
import android.content.Context;
import android.content.res.ColorStateList;
+import android.content.res.Configuration;
import android.content.res.Resources;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
@@ -96,6 +97,12 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
}
@Override
+ protected void onConfigurationChanged(Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ resetState();
+ }
+
+ @Override
protected int getPromtReasonStringRes(int reason) {
// No message on SIM Pin
return 0;