diff options
| author | Diego Perez <diegoperez@google.com> | 2015-05-07 00:49:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-07 00:49:51 +0000 |
| commit | 9207b8567af2ea3913aec6085e8e610a70925e09 (patch) | |
| tree | 70ff5e0803fd1288462b36e30375cc4350b4db9a | |
| parent | c87fe129e5ce33b03c570ce34184395a3011135c (diff) | |
| parent | ae4619dd7f3d48cae2e9b83681849a77a8201142 (diff) | |
| download | frameworks_base-9207b8567af2ea3913aec6085e8e610a70925e09.zip frameworks_base-9207b8567af2ea3913aec6085e8e610a70925e09.tar.gz frameworks_base-9207b8567af2ea3913aec6085e8e610a70925e09.tar.bz2 | |
am ae4619dd: am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit 'ae4619dd7f3d48cae2e9b83681849a77a8201142':
Move StatusBar to use statusBarColor theme attribute
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ public class StatusBar extends CustomBar { 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 @@ public class StatusBar extends CustomBar { // FIXME: use FILL_H? setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT); + int color = getThemeAttrColor(ATTR_COLOR, true); setBackgroundColor(color == 0 ? Config.getStatusBarColor(simulatedPlatformVersion) : color); |