OSDN Git Service

Add override and merged config to WindowContainer
authorAndrii Kulian <akulian@google.com>
Thu, 29 Sep 2016 22:25:00 +0000 (15:25 -0700)
committerAndrii Kulian <akulian@google.com>
Thu, 29 Sep 2016 23:44:38 +0000 (16:44 -0700)
commit441e4494682144aec2ec7f19060464af3d29c319
treecb11b73a90b6f21d69c3f055a6780327a5d2d849
parent015deed8104aae1f306394cdf66088592995f0da
Add override and merged config to WindowContainer

This consolidates usages of override and full (merged)
configs in WM objects and also adds support of per-display
configurations. Having full configs allows us to get
current applied config at any level.

Test: Manual tests pass. Added some new to WindowContainerTests.
Change-Id: I996770433c80da41265f3e14048bd23cead097f9
12 files changed:
services/core/java/com/android/server/wm/AppWindowToken.java
services/core/java/com/android/server/wm/DisplayContent.java
services/core/java/com/android/server/wm/DockedStackDividerController.java
services/core/java/com/android/server/wm/RootWindowContainer.java
services/core/java/com/android/server/wm/Task.java
services/core/java/com/android/server/wm/TaskPositioner.java
services/core/java/com/android/server/wm/TaskStack.java
services/core/java/com/android/server/wm/WindowContainer.java
services/core/java/com/android/server/wm/WindowManagerService.java
services/core/java/com/android/server/wm/WindowState.java
services/core/java/com/android/server/wm/WindowSurfacePlacer.java
services/tests/servicestests/src/com/android/server/wm/WindowContainerTests.java