Merge "Promote isFloating to TestApi" into tm-dev am: 6ed3a87798

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887364

Change-Id: I9d9dea73acc582c929a615bf71050a454fedaebb
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Charles Chen
2022-04-26 06:42:55 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 5 deletions

View File

@@ -464,6 +464,7 @@ package android.app {
method @NonNull public android.graphics.Rect getMaxBounds(); method @NonNull public android.graphics.Rect getMaxBounds();
method public int getRotation(); method public int getRotation();
method public int getWindowingMode(); method public int getWindowingMode();
method public static boolean isFloating(int);
method public void setActivityType(int); method public void setActivityType(int);
method public void setAppBounds(android.graphics.Rect); method public void setAppBounds(android.graphics.Rect);
method public void setBounds(android.graphics.Rect); method public void setBounds(android.graphics.Rect);

View File

@@ -819,11 +819,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu
return isFloating(mWindowingMode); return isFloating(mWindowingMode);
} }
/** /** Returns true if the windowingMode represents a floating window. */
* Returns true if the windowingMode represents a floating window. public static boolean isFloating(@WindowingMode int windowingMode) {
* @hide
*/
public static boolean isFloating(int windowingMode) {
return windowingMode == WINDOWING_MODE_FREEFORM || windowingMode == WINDOWING_MODE_PINNED; return windowingMode == WINDOWING_MODE_FREEFORM || windowingMode == WINDOWING_MODE_PINNED;
} }