am dd79334f: Merge "Fix ActionBar attribute parsing"

* commit 'dd79334f7ecb39135058c2049cd933b4b930a3d1':
  Fix ActionBar attribute parsing
This commit is contained in:
Adam Powell
2014-04-04 19:34:15 +00:00
committed by Android Git Automerger
2 changed files with 11 additions and 0 deletions

View File

@@ -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) {

View File

@@ -6462,4 +6462,8 @@
<attr name="layout_gravity" />
</declare-styleable>
<declare-styleable name="ActionBar_LayoutParams">
<attr name="layout_gravity" />
</declare-styleable>
</resources>