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

Commit cb7ad6eb authored by Abhijoy Saha's avatar Abhijoy Saha Committed by Android (Google) Code Review
Browse files

Merge "Dismiss system dialog"

parents 9a059f69 ebff32a5

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();