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

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

Dismiss system dialog 

This fixed the keypad remains ON when switch facet issue.

BUG: 130573446
Test: Manual

Change-Id: Ia449fb41a03bc02498471ded660d573d5b1ad141
(cherry picked from commit 82298783683ebe82a5847dfd35fc8b3528709930)
parent b397107e

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

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ public class CarFacetButton extends LinearLayout { 
                options.setLaunchDisplayId(mContext.getDisplayId());

                intent.putExtra(EXTRA_FACET_LAUNCH_PICKER, mSelected);

                mContext.startActivityAsUser(intent, options.toBundle(), UserHandle.CURRENT);

                mContext.sendBroadcastAsUser(

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

            });



            if (longPressIntentString != null) {
@@ -128,6 +130,8 @@ public class CarFacetButton extends LinearLayout { 
                    options.setLaunchDisplayId(mContext.getDisplayId());

                    mContext.startActivityAsUser(longPressIntent, options.toBundle(),

                            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
@@ -95,6 +95,9 @@ public class CarNavigationButton extends com.android.keyguard.AlphaOptimizedImag 
                    try {

                        if (mBroadcastIntent) {

                            mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);

                            mContext.sendBroadcastAsUser(

                                    new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS),

                                    UserHandle.CURRENT);

                            return;

                        }

                        ActivityOptions options = ActivityOptions.makeBasic();