diff --git a/api/current.txt b/api/current.txt index 5df8750fcb7c4..78b85015f0d2e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46665,6 +46665,7 @@ package android.widget { ctor public FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams); ctor public FrameLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams); ctor public FrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams); + field public static final int UNSPECIFIED_GRAVITY = -1; // 0xffffffff field public int gravity; } diff --git a/api/system-current.txt b/api/system-current.txt index 5ea800cba480b..14391a3770995 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -49966,6 +49966,7 @@ package android.widget { ctor public FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams); ctor public FrameLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams); ctor public FrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams); + field public static final int UNSPECIFIED_GRAVITY = -1; // 0xffffffff field public int gravity; } diff --git a/api/test-current.txt b/api/test-current.txt index e4b11bd2d4b5e..4e8327880ea67 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -46742,6 +46742,7 @@ package android.widget { ctor public FrameLayout.LayoutParams(android.view.ViewGroup.LayoutParams); ctor public FrameLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams); ctor public FrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams); + field public static final int UNSPECIFIED_GRAVITY = -1; // 0xffffffff field public int gravity; } diff --git a/core/java/android/widget/FrameLayout.java b/core/java/android/widget/FrameLayout.java index 9ac49172ec89a..029313c539389 100644 --- a/core/java/android/widget/FrameLayout.java +++ b/core/java/android/widget/FrameLayout.java @@ -416,23 +416,29 @@ public class FrameLayout extends ViewGroup { * @attr ref android.R.styleable#FrameLayout_Layout_layout_gravity */ public static class LayoutParams extends MarginLayoutParams { + /** + * Value for {@link #gravity} indicating that a gravity has not been + * explicitly specified. + */ + public static final int UNSPECIFIED_GRAVITY = -1; + /** * The gravity to apply with the View to which these layout parameters * are associated. *

- * The default value is {@code Gravity.TOP | Gravity.START} + * The default value is {@link #UNSPECIFIED_GRAVITY}, which is treated + * by FrameLayout as {@code Gravity.TOP | Gravity.START}. * * @see android.view.Gravity * @attr ref android.R.styleable#FrameLayout_Layout_layout_gravity */ - public int gravity = DEFAULT_CHILD_GRAVITY; + public int gravity = UNSPECIFIED_GRAVITY; public LayoutParams(@NonNull Context c, @Nullable AttributeSet attrs) { super(c, attrs); final TypedArray a = c.obtainStyledAttributes(attrs, R.styleable.FrameLayout_Layout); - gravity = a.getInt(R.styleable.FrameLayout_Layout_layout_gravity, - DEFAULT_CHILD_GRAVITY); + gravity = a.getInt(R.styleable.FrameLayout_Layout_layout_gravity, UNSPECIFIED_GRAVITY); a.recycle(); }