Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev

Browse Source 
am: 8940a5b

* commit '8940a5b286295b164ccdd7fd5b1b04171e62e6d1':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: I39220f89c48a8250a8910246382909a1c401d32a
This commit is contained in:
Alan Viverette
2016-04-19 13:42:13 +00:00
committed by android-build-merger
parent 695b7e7a73 8940a5b286
commit e24672ac18
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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;
}

1
api/system-current.txt
View File

@@ -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;
}

1
api/test-current.txt
View File

@@ -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;
}

14
core/java/android/widget/FrameLayout.java
View File

@@ -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.
* <p>
* 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();
}