diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-01-28 09:57:00 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-01-28 09:57:00 -0800 |
| commit | 0f06f2f89132fd7afbaec4683284df26a837cf21 (patch) | |
| tree | 4bbd0b95124cdce4372d10f5d14b8c81447708f8 | |
| parent | ce47b4a5119bd799c907707642193a41e3ec9ba3 (diff) | |
| parent | 27b0373fc7fbed5b848096974df7d4ce1715cdf0 (diff) | |
| download | base-0f06f2f89132fd7afbaec4683284df26a837cf21.tar.gz | |
resolved conflicts for merge of 27b0373f to master
Change-Id: I49fc5a1bf545814449f0c89c7a69ef75cf71d00c
| -rw-r--r-- | phone/com/android/internal/policy/impl/LockScreen.java | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/phone/com/android/internal/policy/impl/LockScreen.java b/phone/com/android/internal/policy/impl/LockScreen.java index 7ec4a40..657bff1 100644 --- a/phone/com/android/internal/policy/impl/LockScreen.java +++ b/phone/com/android/internal/policy/impl/LockScreen.java @@ -490,8 +490,12 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 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 @@ -502,7 +506,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM case SimMissing: // text mCarrier.setText(""); - mScreenLocked.setText(R.string.lockscreen_missing_sim_message_short); + mScreenLocked.setText( + getCarrierString( + mUpdateMonitor.getTelephonyPlmn(), + getContext().getText(R.string.lockscreen_missing_sim_message_short))); // previously shown here: lockscreen_instructions_when_pattern_disabled // layout @@ -513,7 +520,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM case SimMissingLocked: // text mCarrier.setText(""); - mScreenLocked.setText(R.string.lockscreen_missing_sim_message_short); + mScreenLocked.setText( + getCarrierString( + mUpdateMonitor.getTelephonyPlmn(), + getContext().getText(R.string.lockscreen_missing_sim_message_short))); // previously shown here: lockscreen_missing_sim_instructions // layout @@ -523,7 +533,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM 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); @@ -533,7 +546,10 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM case SimPukLocked: // text mCarrier.setText(""); - mScreenLocked.setText(R.string.lockscreen_sim_puk_locked_message); + mScreenLocked.setText( + getCarrierString( + mUpdateMonitor.getTelephonyPlmn(), + getContext().getText(R.string.lockscreen_sim_puk_locked_message))); // previously shown here: lockscreen_sim_puk_locked_instructions); // layout |