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

Commit f3956afd authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
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
parents 54238c6a 7f5730b5

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

+2 −1
Original line number Original line 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 android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;

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

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

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

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;

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





/**

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




    private void adjustSpecialWindows() {

    private void adjustSpecialWindows() {

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

        // 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

        // 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

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