commit 6a5030748a0f18f58bb87dbb95d82f2eae395583
author John Wang <johnwang@google.com> Thu Jan 21 17:30:07 2010 -0800
committer John Wang <johnwang@google.com> Thu Jan 21 17:30:07 2010 -0800
tree 6aa3bb3079b30fcb27620243c540a5c66d863b84
parent a3b4a8111c47852e212032008732e143636151e4

Update carrier display in lockscreen.

For bug 2352904, lockscreen need clearly show "Emergency Calls Only" status no matter with SIM status.

The change is to show both SIM card status and carrier PLMN including "Emergency Calls Only" status.

phone/com/android/internal/policy/impl/LockScreen.java

diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java
index 7514cc2..c370f9e 100644
--- a/phone/com/android/internal/policy/impl/LockScreen.java
+++ b/phone/com/android/internal/policy/impl/LockScreen.java
@@ -470,8 +470,12 @@
                 mEmergencyCallButton.setVisibility(View.GONE);
                 break;
             case NetworkLocked:
-                //  text
-                mCarrier.setText(R.string.lockscreen_network_locked_message);
+                // The carrier string shows both sim card status (i.e. No Sim Card) and
+                // carrier's name and/or "Emergency Calls Only" status
+                mCarrier.setText(
+                        getCarrierString(
+                                mUpdateMonitor.getTelephonyPlmn(),
+                                getContext().getText(R.string.lockscreen_network_locked_message)));
                 mScreenLocked.setText(R.string.lockscreen_instructions_when_pattern_disabled);
 
                 // layout
@@ -481,7 +485,10 @@
                 break;
             case SimMissing:
                 // text
-                mCarrier.setText(R.string.lockscreen_missing_sim_message_short);
+                mCarrier.setText(
+                        getCarrierString(
+                                mUpdateMonitor.getTelephonyPlmn(),
+                                getContext().getText(R.string.lockscreen_missing_sim_message_short)));
                 mScreenLocked.setText(R.string.lockscreen_instructions_when_pattern_disabled);
 
                 // layout
@@ -492,7 +499,10 @@
                 break;
             case SimMissingLocked:
                 // text
-                mCarrier.setText(R.string.lockscreen_missing_sim_message_short);
+                mCarrier.setText(
+                        getCarrierString(
+                                mUpdateMonitor.getTelephonyPlmn(),
+                                getContext().getText(R.string.lockscreen_missing_sim_message_short)));
                 mScreenLocked.setText(R.string.lockscreen_missing_sim_instructions);
 
                 // layout
@@ -503,7 +513,10 @@
                 break;
             case SimLocked:
                 // text
-                mCarrier.setText(R.string.lockscreen_sim_locked_message);
+                mCarrier.setText(
+                        getCarrierString(
+                                mUpdateMonitor.getTelephonyPlmn(),
+                                getContext().getText(R.string.lockscreen_sim_locked_message)));
 
                 // layout
                 mScreenLocked.setVisibility(View.INVISIBLE);
@@ -512,7 +525,10 @@
                 break;
             case SimPukLocked:
                 // text
-                mCarrier.setText(R.string.lockscreen_sim_puk_locked_message);
+                mCarrier.setText(
+                        getCarrierString(
+                                mUpdateMonitor.getTelephonyPlmn(),
+                                getContext().getText(R.string.lockscreen_sim_puk_locked_message)));
                 mScreenLocked.setText(R.string.lockscreen_sim_puk_locked_instructions);
 
                 // layout