Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4c2e916 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Promote isFloating to TestApi" into tm-dev am: 6ed3a877 am: 98ff6c83 

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



Change-Id: Ic5e30c76c23e88986473559b7d2ca496afee9f93
Ignore-AOSP-First: this is an automerge
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea74e854 98ff6c83

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ package android.app { 
    method @NonNull public android.graphics.Rect getMaxBounds();

    method public int getRotation();

    method public int getWindowingMode();

    method public static boolean isFloating(int);

    method public void setActivityType(int);

    method public void setAppBounds(android.graphics.Rect);

    method public void setBounds(android.graphics.Rect);

core/java/android/app/WindowConfiguration.java

+2 −5
Original line number Diff line number Diff line
@@ -819,11 +819,8 @@ public class WindowConfiguration implements Parcelable, Comparable<WindowConfigu 
        return isFloating(mWindowingMode);

    }



    /**

     * Returns true if the windowingMode represents a floating window.

     * @hide

     */

    public static boolean isFloating(int windowingMode) {

    /** Returns true if the windowingMode represents a floating window. */

    public static boolean isFloating(@WindowingMode int windowingMode) {

        return windowingMode == WINDOWING_MODE_FREEFORM || windowingMode == WINDOWING_MODE_PINNED;

    }