Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8e1e74d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 27b0373f to master 

Change-Id: I49fc5a1bf545814449f0c89c7a69ef75cf71d00c
parents 5704f326 d6a93550

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

+22 −6
Original line number Diff line number Diff line
@@ -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