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

Commit dd79334f authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix ActionBar attribute parsing"

parents 43c290f0 b226bea1

core/java/android/app/ActionBar.java

+7 −0
Original line number Diff line number Diff line
@@ -1224,6 +1224,13 @@ public abstract class ActionBar { 


        public LayoutParams(@NonNull Context c, AttributeSet attrs) {

            super(c, attrs);



            TypedArray a = c.obtainStyledAttributes(attrs,

                    com.android.internal.R.styleable.ActionBar_LayoutParams);

            gravity = a.getInt(

                    com.android.internal.R.styleable.ActionBar_LayoutParams_layout_gravity,

                    Gravity.NO_GRAVITY);

            a.recycle();

        }



        public LayoutParams(int width, int height) {

core/res/res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -6462,4 +6462,8 @@ 
        <attr name="layout_gravity" />

    </declare-styleable>



    <declare-styleable name="ActionBar_LayoutParams">

        <attr name="layout_gravity" />

    </declare-styleable>



</resources>