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

Commit 0dfa35c2 authored by Linus Tufvesson's avatar Linus Tufvesson Committed by Automerger Merge Worker
Browse files

Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev... 

Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b6668498 am: 52547c12 am: a9f9777b

Change-Id: Icc21f0adacb3596adfe64aa464211882e87ebdbf
parents 1c04efbc a9f9777b

core/java/android/app/Presentation.java

+6 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import static android.content.Context.DISPLAY_SERVICE;

import static android.content.Context.WINDOW_SERVICE;

import static android.view.WindowManager.LayoutParams.TYPE_PRESENTATION;

import static android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION;



import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;
@@ -191,12 +192,16 @@ public class Presentation extends Dialog { 
        mDisplay = display;

        mDisplayManager = (DisplayManager)getContext().getSystemService(DISPLAY_SERVICE);



        final int windowType =

                (display.getFlags() & Display.FLAG_PRIVATE) != 0 ? TYPE_PRIVATE_PRESENTATION

                        : TYPE_PRESENTATION;



        final Window w = getWindow();

        final WindowManager.LayoutParams attr = w.getAttributes();

        attr.token = mToken;

        w.setAttributes(attr);

        w.setGravity(Gravity.FILL);

        w.setType(TYPE_PRESENTATION);

        w.setType(windowType);

        setCanceledOnTouchOutside(false);

    }