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

Commit e24672ac authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

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

am: 8940a5b2

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

Change-Id: I39220f89c48a8250a8910246382909a1c401d32a
parents 695b7e7a 8940a5b2

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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;

  }

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








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















  }







































api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








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















  }







































core/java/android/widget/FrameLayout.java



+10
−4




























Original line number
Diff line number
Diff line








@@ -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();















        }