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

Commit 5807021a authored by Evan Laird's avatar Evan Laird Committed by Android (Google) Code Review
Browse files

Merge "Use SystemUIDialog.setWindowOnTop to make user-switching dialogs not steal focus"

parents 86d05733 d4a44ff1

packages/SystemUI/src/com/android/systemui/statusbar/policy/UserSwitcherController.java

+2 −0
Original line number Diff line number Diff line
@@ -910,6 +910,7 @@ public class UserSwitcherController { 
                    context.getString(android.R.string.cancel), this);

            setButton(DialogInterface.BUTTON_POSITIVE,

                    context.getString(R.string.guest_exit_guest_dialog_remove), this);

            SystemUIDialog.setWindowOnTop(this);

            setCanceledOnTouchOutside(false);

            mGuestId = guestId;

            mTargetId = targetId;
@@ -937,6 +938,7 @@ public class UserSwitcherController { 
                    context.getString(android.R.string.cancel), this);

            setButton(DialogInterface.BUTTON_POSITIVE,

                    context.getString(android.R.string.ok), this);

            SystemUIDialog.setWindowOnTop(this);

        }



        @Override