diff options
| author | Kazuki Takise <takise@google.com> | 2018-06-18 18:18:36 +0900 |
|---|---|---|
| committer | Kazuki Takise <takise@google.com> | 2018-06-22 16:05:16 +0900 |
| commit | f85197be4a47061b39e7e10224fa0b16b6dc3eda (patch) | |
| tree | 2803cbca67f006f7207d2d6110a1f8409ce29258 /core/java/android/app/WindowConfiguration.java | |
| parent | 4e7e789be2e5698216d017a3ac83f7d877790a39 (diff) | |
Position stack at top when always on top flag is set
When always on top is set, the position of the stack must be
changed in ActivityDisplay and in DisplayContent. This CL
introduces this logic in ActivityStack.setAlwaysOnTop().
Bug: 69370884
Test: go/wm-smoke
Test: atest DisplayContentTests
Test: atest WindowContainerTests
Change-Id: Ie7efe175175a4db209a6b0f3476d9dfc27432df5
Diffstat (limited to 'core/java/android/app/WindowConfiguration.java')
| -rw-r--r-- | core/java/android/app/WindowConfiguration.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/app/WindowConfiguration.java b/core/java/android/app/WindowConfiguration.java index 7a729f97bb9a..aea767ecb3f0 100644 --- a/core/java/android/app/WindowConfiguration.java +++ b/core/java/android/app/WindowConfiguration.java @@ -488,7 +488,7 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu + " mAppBounds=" + mAppBounds + " mWindowingMode=" + windowingModeToString(mWindowingMode) + " mActivityType=" + activityTypeToString(mActivityType) - + " mAlwaysOnTop=" + activityTypeToString(mAlwaysOnTop) + + " mAlwaysOnTop=" + alwaysOnTopToString(mAlwaysOnTop) + "}"; } @@ -652,4 +652,14 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu } return String.valueOf(applicationType); } + + /** @hide */ + public static String alwaysOnTopToString(@AlwaysOnTop int alwaysOnTop) { + switch (alwaysOnTop) { + case ALWAYS_ON_TOP_UNDEFINED: return "undefined"; + case ALWAYS_ON_TOP_ON: return "on"; + case ALWAYS_ON_TOP_OFF: return "off"; + } + return String.valueOf(alwaysOnTop); + } } |