diff options
| author | Adam Powell <adamp@google.com> | 2014-04-04 19:28:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 19:28:46 +0000 |
| commit | dd79334f7ecb39135058c2049cd933b4b930a3d1 (patch) | |
| tree | 75937ca94e69eaa3c4cf9fd6d5bb9d84088a80cc | |
| parent | 43c290f05cae0a600243d2e1ad52a07e4ca5e003 (diff) | |
| parent | b226bea10880b3e8e3916b8ca96c51c1a59f5a03 (diff) | |
| download | frameworks_base-dd79334f7ecb39135058c2049cd933b4b930a3d1.zip frameworks_base-dd79334f7ecb39135058c2049cd933b4b930a3d1.tar.gz frameworks_base-dd79334f7ecb39135058c2049cd933b4b930a3d1.tar.bz2 | |
Merge "Fix ActionBar attribute parsing"
| -rw-r--r-- | core/java/android/app/ActionBar.java | 7 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/app/ActionBar.java b/core/java/android/app/ActionBar.java index 13ae352..34b0f3a 100644 --- a/core/java/android/app/ActionBar.java +++ b/core/java/android/app/ActionBar.java @@ -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) { diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 00b61a5..0fc198e 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -6462,4 +6462,8 @@ <attr name="layout_gravity" /> </declare-styleable> + <declare-styleable name="ActionBar_LayoutParams"> + <attr name="layout_gravity" /> + </declare-styleable> + </resources> |