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

Commit a64b4840 authored by Jian Jin's avatar Jian Jin Committed by android-build-merger
Browse files

Merge "Add Cancel button in Car Keyguard" into pi-dev 

am: 616a2144

Change-Id: I60b8f801ddee218b23af4a6e263079056e09951f
parents b13f71a1 616a2144

packages/SystemUI/res/values/ids.xml

+3 −0
Original line number Diff line number Diff line
@@ -98,5 +98,8 @@ 
    <item type="id" name="status_bar_view_state_tag" />



    <item type="id" name="display_cutout" />



    <!-- Optional cancel button on Keyguard -->

    <item type="id" name="cancel_button"/>

</resources>

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+7 −0
Original line number Diff line number Diff line
@@ -107,6 +107,13 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 
                new View[]{

                        null, mEcaView, null

                }};



        View cancelBtn = findViewById(R.id.cancel_button);

        if (cancelBtn != null) {

            cancelBtn.setOnClickListener(view -> {

                mCallback.reset();

            });

        }

    }



    @Override

packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java

+7 −0
Original line number Diff line number Diff line
@@ -205,6 +205,13 @@ public class KeyguardPasswordView extends KeyguardAbsKeyInputView 
            }

        });



        View cancelBtn = findViewById(R.id.cancel_button);

        if (cancelBtn != null) {

            cancelBtn.setOnClickListener(view -> {

                mCallback.reset();

            });

        }



        // If there's more than one IME, enable the IME switcher button

        updateSwitchImeButton();

packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java

+7 −0
Original line number Diff line number Diff line
@@ -157,6 +157,13 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit 
        if (button != null) {

            button.setCallback(this);

        }



        View cancelBtn = findViewById(R.id.cancel_button);

        if (cancelBtn != null) {

            cancelBtn.setOnClickListener(view -> {

                mCallback.reset();

            });

        }

    }



    @Override