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

Commit d3cee177 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Keyguard: Add config to always enable emergency call button"

parents b1604140 fd1c8164

packages/Keyguard/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -29,4 +29,7 @@ 
    <!-- Allow the menu hard key to be disabled in LockScreen on some devices [DO NOT TRANSLATE] -->

    <bool name="config_disableMenuKeyInLockScreen">false</bool>



    <!-- True if we need to show on "Slide" lock screen -->

    <bool name="config_showEmergencyButton">false</bool>



</resources>

packages/Keyguard/src/com/android/keyguard/EmergencyButton.java

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ public class EmergencyButton extends Button { 
            } else {

                // True if we need to show a secure screen (pin/pattern/SIM pin/SIM puk);

                // hides emergency button on "Slide" screen if device is not secure.

                enabled = mLockPatternUtils.isSecure();

                enabled = mLockPatternUtils.isSecure() ||

                        mContext.getResources().getBoolean(R.bool.config_showEmergencyButton);

            }

        }

        mLockPatternUtils.updateEmergencyCallButtonState(this, phoneState, enabled, false);