From b226bea10880b3e8e3916b8ca96c51c1a59f5a03 Mon Sep 17 00:00:00 2001
From: Adam Powell <adamp@google.com>
Date: Fri, 4 Apr 2014 12:23:42 -0700
Subject: Fix ActionBar attribute parsing

Lost in some prior refactoring. Also fixes doc builds for the removed
styleable.

Change-Id: Ice27a978cd5c22c6ad1fc0b45557c6cac77b5985
---
 core/java/android/app/ActionBar.java | 7 +++++++
 core/res/res/values/attrs.xml        | 4 ++++
 2 files changed, 11 insertions(+)

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>
-- 
cgit v1.1