Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use TYPE_PRIVATE_PRESENTATION for private presentations" into rvc-dev am: b66684981f am: 52547c1250

Browse Source 
Change-Id: Ic3dd68ae54e280203307b5e68a0982ecad844da7
This commit is contained in:
Linus Tufvesson
2020-04-07 12:01:45 +00:00
committed by Automerger Merge Worker
parent 831f06d98e 52547c1250
commit a9f9777b70
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/app/Presentation.java
View File

@@ -19,6 +19,7 @@ package android.app;
import static android.content.Context.DISPLAY_SERVICE; import static android.content.Context.DISPLAY_SERVICE;
import static android.content.Context.WINDOW_SERVICE; import static android.content.Context.WINDOW_SERVICE;
import static android.view.WindowManager.LayoutParams.TYPE_PRESENTATION; import static android.view.WindowManager.LayoutParams.TYPE_PRESENTATION;
import static android.view.WindowManager.LayoutParams.TYPE_PRIVATE_PRESENTATION;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.Context; import android.content.Context;
@@ -191,12 +192,16 @@ public class Presentation extends Dialog {
mDisplay = display; mDisplay = display;
mDisplayManager = (DisplayManager)getContext().getSystemService(DISPLAY_SERVICE); 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 Window w = getWindow();
final WindowManager.LayoutParams attr = w.getAttributes(); final WindowManager.LayoutParams attr = w.getAttributes();
attr.token = mToken; attr.token = mToken;
w.setAttributes(attr); w.setAttributes(attr);
w.setGravity(Gravity.FILL); w.setGravity(Gravity.FILL);
w.setType(TYPE_PRESENTATION); w.setType(windowType);
setCanceledOnTouchOutside(false); setCanceledOnTouchOutside(false);
} }