From 2b4b335dfbb0ac1262f2d13828352e19adf930a5 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Fri, 15 Apr 2016 11:10:28 -0400 Subject: [PATCH] Revert FrameLayout.LayoutParams default gravity to -1 Documents the default value and how this is interpreted by FrameLayout. Bug: 27576632 Change-Id: Icb76c5382462184ae02e86ce1b0101c12473aee2 --- api/current.txt | 1 + api/system-current.txt | 1 + api/test-current.txt | 1 + core/java/android/widget/FrameLayout.java | 14 ++++++++++---- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/api/current.txt b/api/current.txt index c1dbce7147350..9e00e46e46ba2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46695,6 +46695,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 9a39b4cd74c25..65af78f0573dc 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -49808,6 +49808,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 6895d483b569d..f716e085a8903 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -46772,6 +46772,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(); }