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

Commit 98f82e1c 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 control whether show cancel button"

parents b4933e63 b393605c

packages/Keyguard/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -41,4 +41,7 @@ 


    <!-- display airplane mode in lock sreen when phone is in APM mode -->

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



    <!-- show cancel button on SIM PIN lock screen-->

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

</resources>

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

+8 −1
Original line number Diff line number Diff line
@@ -140,7 +140,14 @@ public class KeyguardSimPinView extends KeyguardAbsKeyInputView 
                }

            });

        }

        if (mContext.getResources().getBoolean(R.bool.config_show_cancel_button)) {

            showCancelButton();

        } else {

            final View cancel = findViewById(R.id.key_cancel);

            if (cancel != null) {

                cancel.setVisibility(INVISIBLE);

            }

        }



        // The delete button is of the PIN keyboard itself in some (e.g. tablet) layouts,

        // not a separate view