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

Commit 07af6953 authored by Lin Guo's avatar Lin Guo Committed by Abhijoy Saha
Browse files

DO NOT MERGE Dismiss system dialog 

This fixed the keypad remains ON when switch facet issue.

BUG: 130573446, 149228466
Test: Manual

Change-Id: Ia449fb41a03bc02498471ded660d573d5b1ad141
(cherry picked from commit 82298783683ebe82a5847dfd35fc8b3528709930)
(cherry picked from commit ebff32a5)
parent 928add13

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarFacetButton.java

+7 −1
Original line number Diff line number Diff line
@@ -125,13 +125,19 @@ public class CarFacetButton extends LinearLayout { 


    /** Defines the behavior of a button click. */

    protected OnClickListener getButtonClickListener(Intent toSend) {

        return v -> mContext.startActivityAsUser(toSend, UserHandle.CURRENT);

        return v ->  {

            mContext.startActivityAsUser(toSend, UserHandle.CURRENT);

            mContext.sendBroadcastAsUser(

                    new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);

        };

    }



    /** Defines the behavior of a long click. */

    protected OnLongClickListener getButtonLongClickListener(Intent toSend) {

        return v -> {

            mContext.startActivityAsUser(toSend, UserHandle.CURRENT);

            mContext.sendBroadcastAsUser(

                    new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), UserHandle.CURRENT);

            return true;

        };

    }

packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarNavigationButton.java

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag 
            try {

                if (mBroadcastIntent) {

                    mContext.sendBroadcastAsUser(toSend, UserHandle.CURRENT);

                    mContext.sendBroadcastAsUser(

                            new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS),

                            UserHandle.CURRENT);

                    return;

                }

                mContext.startActivityAsUser(toSend, UserHandle.CURRENT);