diff options
| author | Kazuki Takise <takise@google.com> | 2018-06-27 17:05:11 +0900 |
|---|---|---|
| committer | Kazuki Takise <takise@google.com> | 2018-07-17 16:09:57 +0900 |
| commit | 048e2661ee4e76c1358ea77a9050619f0b960471 (patch) | |
| tree | 30b4256de2c7ea3fae9b4ca8b82fd0f801803c21 /core/java/android/app/WindowConfiguration.java | |
| parent | a800f9ab6bf515f0a43dd2ce949e67c76afa4f85 (diff) | |
Defer always on top state when task gets maximized
This CL enables always on top to be restored/deferred when
stacks switch between freeform and fullscreen.
Bug: 110494387
Test: ActivityStackTests
Test: DisplayContentTests
Test: go/wm-smoke
Change-Id: Iccb9824f845dea4925fac5d5dcb5eeaab2acdfcd
Diffstat (limited to 'core/java/android/app/WindowConfiguration.java')
| -rw-r--r-- | core/java/android/app/WindowConfiguration.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index aea767ecb3f0..e6fb5dc02ce3 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -575,7 +575,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu * @hide */ public boolean isAlwaysOnTop() { - return mWindowingMode == WINDOWING_MODE_PINNED || mAlwaysOnTop == ALWAYS_ON_TOP_ON; + return mWindowingMode == WINDOWING_MODE_PINNED + || (mWindowingMode == WINDOWING_MODE_FREEFORM && mAlwaysOnTop == ALWAYS_ON_TOP_ON); } /** |