commit 19dbe50bb534db6fa46f0df47f589a69212e9458
author Diego Perez <diegoperez@google.com> Wed May 06 23:45:40 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 06 23:45:41 2015 +0000
tree 8a5aaa77d5f79f9578344b5341e4596aa54f741b
parent bc47abe4b444d0386d1d939e4a223a976fade565
parent d0546353a8ce2d9df5b390d0df967c0ee5eb7ca5

Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
index e5f1f68..60e9cc8 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
@@ -39,7 +39,7 @@
 
     private final int mSimulatedPlatformVersion;
     /** Status bar background color attribute name. */
-    private static final String ATTR_COLOR = "colorPrimaryDark";
+    private static final String ATTR_COLOR = "statusBarColor";
 
     public StatusBar(BridgeContext context, Density density, int direction, boolean RtlEnabled,
             int simulatedPlatformVersion) throws XmlPullParserException {
@@ -50,6 +50,7 @@
 
         // FIXME: use FILL_H?
         setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT);
+
         int color = getThemeAttrColor(ATTR_COLOR, true);
         setBackgroundColor(color == 0 ? Config.getStatusBarColor(simulatedPlatformVersion) : color);