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

Commit fcbb0e0f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

DO NOT MERGE Dismiss system dialog am: 07af6953

Change-Id: I49650bdefe90510fde2f6de95f32a7229b1a17e4
parents b585c1cc 07af6953
Loading
Loading
Loading
Loading
+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;
        };
    }
+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);