summaryrefslogtreecommitdiffstats
path: root/packages/Keyguard
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-09-24 02:29:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-24 02:29:01 +0000
commitb278ea0cab555f16d0d8278ee3eadf75c6266920 (patch)
tree0183e58da47c44d7b0b6a10d5dca6fe34afa87e0 /packages/Keyguard
parent51a05d74a81aeb334ef095fc6f1aa98e5163763f (diff)
parent27f26df629e7a5c2ea87ad46708dc4678c11d27a (diff)
downloadframeworks_base-b278ea0cab555f16d0d8278ee3eadf75c6266920.zip
frameworks_base-b278ea0cab555f16d0d8278ee3eadf75c6266920.tar.gz
frameworks_base-b278ea0cab555f16d0d8278ee3eadf75c6266920.tar.bz2
am 27f26df6: am 05b11bf3: Merge "Update message in SIM PIN view when configuration changes" into mnc-dr-dev
* commit '27f26df629e7a5c2ea87ad46708dc4678c11d27a': Update message in SIM PIN view when configuration changes
Diffstat (limited to 'packages/Keyguard')
-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;