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

Commit 1c88a616 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix bugs in cast QS tile" into oc-dev

am: 03e920f3

Change-Id: Ia953f48fe08bd8058cbc9e9bce1ab7466d03aa29
parents 65c57bc2 03e920f3
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public class CastTile extends QSTileImpl<BooleanState> {
    private final Callback mCallback = new Callback();
    private final ActivityStarter mActivityStarter;
    private Dialog mDialog;
    private boolean mRegistered;

    public CastTile(QSHost host) {
        super(host);
@@ -146,7 +147,7 @@ public class CastTile extends QSTileImpl<BooleanState> {
                mDialog = dialog;
            }
            mDialog.getWindow().setType(WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL);
            mDialog.show();
            mUiHandler.post(() -> mDialog.show());
            registerReceiver();
            mHost.collapsePanels();
        });
@@ -155,7 +156,13 @@ public class CastTile extends QSTileImpl<BooleanState> {
    private void registerReceiver() {
        mContext.registerReceiverAsUser(mReceiver, UserHandle.CURRENT,
                new IntentFilter(Intent.ACTION_CLOSE_SYSTEM_DIALOGS), null, null);
        mDialog.setOnDismissListener(dialog -> mContext.unregisterReceiver(mReceiver));
        mRegistered = true;
        mDialog.setOnDismissListener(dialog -> {
            if (mRegistered) {
                mContext.unregisterReceiver(mReceiver);
                mRegistered = false;
            }
        });
    }

    @Override