diff options
| author | 2017-08-28 22:48:45 +0000 | |
|---|---|---|
| committer | 2017-08-28 22:48:45 +0000 | |
| commit | 7f5730b5e4fb4ef275a489ffa3ca9f56b1bd66f2 (patch) | |
| tree | d445090103d611c0626b8e9f01e399a498d49733 | |
| parent | d194882e52aa7aece85c1a5340e9cffa0e017f2a (diff) | |
| parent | f3f7a101fb541357be502f6b073b8398d0420716 (diff) | |
Merge "Bump special windows layer adjustment" into oc-mr1-dev
am: f3f7a101fb
Change-Id: I233c1302fd7f86854255e64c06ef5c5130f77a29
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowLayersController.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/WindowLayersController.java b/services/core/java/com/android/server/wm/WindowLayersController.java index 5dc79f8500c0..5d1083e2be26 100644 --- a/services/core/java/com/android/server/wm/WindowLayersController.java +++ b/services/core/java/com/android/server/wm/WindowLayersController.java @@ -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 |