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

resolved conflicts for merge of 27b0373f to master

Browse Source 
Change-Id: I49fc5a1bf545814449f0c89c7a69ef75cf71d00c
This commit is contained in:
Jean-Baptiste Queru
2010-01-28 09:57:00 -08:00
parent 5704f326e0 d6a9355031
commit d8e1e74ddb
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
policy/com/android/internal/policy/impl/LockScreen.java
View File

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