Back-port fixes for b/62196835

am: 5bdffc5d57

Change-Id: Ia5dafc7a8724d296e710f32d936bb493b51951de
This commit is contained in:
Phil Weaver
2017-07-12 21:43:46 +00:00
committed by android-build-merger
6 changed files with 125 additions and 1 deletions

View File

@@ -547,6 +547,25 @@ public interface WindowManager extends ViewManager {
*/
public static final int LAST_SYSTEM_WINDOW = 2999;
/**
* Return true if the window type is an alert window.
*
* @param type The window type.
* @return If the window type is an alert window.
* @hide
*/
public static boolean isSystemAlertWindowType(int type) {
switch (type) {
case TYPE_PHONE:
case TYPE_PRIORITY_PHONE:
case TYPE_SYSTEM_ALERT:
case TYPE_SYSTEM_ERROR:
case TYPE_SYSTEM_OVERLAY:
return true;
}
return false;
}
/** @deprecated this is ignored, this value is set automatically when needed. */
@Deprecated
public static final int MEMORY_TYPE_NORMAL = 0;
@@ -1086,6 +1105,15 @@ public interface WindowManager extends ViewManager {
* {@hide} */
public static final int PRIVATE_FLAG_INHERIT_TRANSLUCENT_DECOR = 0x00000200;
/**
* Flag to indicate that any window added by an application process that is of type
* {@link #TYPE_TOAST} or that requires
* {@link android.app.AppOpsManager#OP_SYSTEM_ALERT_WINDOW} permission should be hidden when
* this window is visible.
* @hide
*/
public static final int PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS = 0x00080000;
/**
* Control flags that are private to the platform.
* @hide