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

Commit ff002f54 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I96cf4d06,Ic706c0d1 

* changes:
  WM: Change Z-Order of internal TYPE_SYSTEM_ALERT windows to be higher than TYPE_APPLICATION_OVERLAY
  Revert "WM: Switch to using APPLICATION_OVERLAY window type for ErrorDialogs"
parents 4a7bb6e1 90f97fe2

services/core/java/com/android/server/am/BaseErrorDialog.java

+3 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.server.am;



import com.android.internal.R;



import android.app.AlertDialog;

import android.content.Context;

import android.os.Handler;
@@ -24,8 +26,6 @@ import android.view.KeyEvent; 
import android.view.WindowManager;

import android.widget.Button;



import com.android.internal.R;



public class BaseErrorDialog extends AlertDialog {

    private static final int ENABLE_BUTTONS = 0;

    private static final int DISABLE_BUTTONS = 1;
@@ -36,7 +36,7 @@ public class BaseErrorDialog extends AlertDialog { 
        super(context, com.android.internal.R.style.Theme_DeviceDefault_Dialog_AppError);

        context.assertRuntimeOverlayThemable();



        getWindow().setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);

        getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,

                WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);

        WindowManager.LayoutParams attrs = getWindow().getAttributes();

services/core/java/com/android/server/policy/PhoneWindowManager.java

+0 −1
Original line number Diff line number Diff line
@@ -2522,7 +2522,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private static final int[] WINDOW_TYPES_WHERE_HOME_DOESNT_WORK = {

            WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY,

            WindowManager.LayoutParams.TYPE_SYSTEM_ALERT,

            WindowManager.LayoutParams.TYPE_SYSTEM_ERROR,

        };

services/core/java/com/android/server/policy/WindowManagerPolicy.java

+4 −2
Original line number Diff line number Diff line
@@ -829,9 +829,11 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants { 
                return  9;

            case TYPE_SYSTEM_ALERT:

                // like the ANR / app crashed dialogs

                return  canAddInternalSystemWindow ? 11 : 10;

                // Type is deprecated for non-system apps. For system apps, this type should be

                // in a higher layer than TYPE_APPLICATION_OVERLAY.

                return  canAddInternalSystemWindow ? 13 : 10;

            case TYPE_APPLICATION_OVERLAY:

                return  canAddInternalSystemWindow ? 13 : 12;

                return  12;

            case TYPE_DREAM:

                // used for Dreams (screensavers with TYPE_DREAM windows)

                return  14;

services/core/java/com/android/server/wm/DisplayPolicy.java

+1 −3
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLES 
import static android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_NOTHING;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
@@ -2067,8 +2066,7 @@ public class DisplayPolicy { 
                    of.set(displayFrames.mRestricted);

                    df.set(displayFrames.mRestricted);

                    pf.set(displayFrames.mRestricted);

                } else if (type == TYPE_TOAST || type == TYPE_SYSTEM_ALERT

                        || type == TYPE_APPLICATION_OVERLAY) {

                } else if (type == TYPE_TOAST || type == TYPE_SYSTEM_ALERT) {

                    // These dialogs are stable to interim decor changes.

                    cf.set(displayFrames.mStable);

                    of.set(displayFrames.mStable);