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

Commit ef9a6d7c authored by Johannes Gallmann's avatar Johannes Gallmann Committed by Android (Google) Code Review
Browse files

Merge "Fix predictive back not working for screen cast dialog from lockscreen" into main

parents 911a674f bc9e8698

packages/SystemUI/src/com/android/systemui/qs/tiles/CastTile.java

+14 −9
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import com.android.systemui.statusbar.policy.CastController; 
import com.android.systemui.statusbar.policy.CastController.CastDevice;

import com.android.systemui.statusbar.policy.HotspotController;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.systemui.util.DialogKt;



import java.util.ArrayList;

import java.util.List;
@@ -245,6 +246,10 @@ public class CastTile extends QSTileImpl<BooleanState> { 
                            new DialogCuj(InteractionJankMonitor.CUJ_SHADE_DIALOG_OPEN,

                                    INTERACTION_JANK_TAG));

                } else {

                    if (dialog.getWindow() != null) {

                        DialogKt.registerAnimationOnBackInvoked(dialog,

                                dialog.getWindow().getDecorView());

                    }

                    dialog.show();

                }

            });