OSDN Git Service

Merge "Preserve non-floating state when entering pinned stack." into oc-dev
authorRob Carr <racarr@google.com>
Mon, 15 May 2017 23:17:30 +0000 (23:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 15 May 2017 23:17:33 +0000 (23:17 +0000)
commitf5b6818009a70d77a272ca9b7b2aa167507dfd07
tree9fc185c1c4ea30f078cf79abd74c3e8e244d2c1b
parent2b1df4ec14ae8cced2bd74cb60d0f2751562d02d
parent18f622f08ce84bfb1a6cf19bca33d3ef0ad4aca9
Merge "Preserve non-floating state when entering pinned stack." into oc-dev
core/java/android/app/Activity.java
core/java/android/view/ViewRootImpl.java
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/wm/WindowManagerService.java
services/core/java/com/android/server/wm/WindowStateAnimator.java