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

Commit 2f5851f1 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am:... 

Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am: f3f7a101" into oc-mr1-dev-plus-aosp
am: f3956afd

Change-Id: Ia935f34470f34f7ec723fd318cf7a6cbfcbb096c
parents e2d814e5 f3956afd

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

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static android.view.Display.DEFAULT_DISPLAY; 
import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_LAYERS;

import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;

import static com.android.server.wm.WindowManagerService.TYPE_LAYER_OFFSET;

import static com.android.server.wm.WindowManagerService.WINDOW_LAYER_MULTIPLIER;



/**
@@ -198,7 +199,7 @@ class WindowLayersController { 


    private void adjustSpecialWindows() {

        // The following adjustments are beyond the highest docked-affected layer

        int layer = mHighestDockedAffectedLayer +  WINDOW_LAYER_MULTIPLIER;

        int layer = mHighestDockedAffectedLayer +  TYPE_LAYER_OFFSET;



        // Adjust the docked stack windows and dock divider above only the windows that are affected

        // by the docked stack. When this happens, also boost the assistant window layers, otherwise