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

Commit bd1dda27 authored by Marvin Ramin's avatar Marvin Ramin
Browse files

Make MediaProjection Dialog a simple ALERT_DIALOG

Prevents it from showing while keyguard is active even when it is
launched from an Activity that has FLAG_SHOW_WHEN_LOCKED or otherwise
displays on top of keyguard.

Bug: 351409536
Flag: EXEMPT bugfix
Test: manual
Change-Id: I9d94853987e887e4a8ed942184ab354a9d0298d2
parent 496c34da
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.text.TextPaint;
import android.text.TextUtils;
import android.util.Log;
import android.view.Window;
import android.view.WindowManager;

import com.android.systemui.flags.FeatureFlags;
import com.android.systemui.flags.Flags;
@@ -308,6 +309,9 @@ public class MediaProjectionPermissionActivity extends Activity {
    private void setUpDialog(AlertDialog dialog) {
        SystemUIDialog.registerDismissListener(dialog);
        SystemUIDialog.applyFlags(dialog, /* showWhenLocked= */ false);

        final Window w = dialog.getWindow();
        w.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);
        SystemUIDialog.setDialogSize(dialog);

        dialog.setOnCancelListener(this::onDialogDismissedOrCancelled);
@@ -315,7 +319,6 @@ public class MediaProjectionPermissionActivity extends Activity {
        dialog.create();
        dialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);

        final Window w = dialog.getWindow();
        w.addSystemFlags(SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
    }