diff options
| author | Diego Perez <diegoperez@google.com> | 2015-05-07 00:21:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-07 00:21:29 +0000 |
| commit | ae4619dd7f3d48cae2e9b83681849a77a8201142 (patch) | |
| tree | a3ca3eb5399c842bbc11528514eb4c697b726801 /tools/layoutlib | |
| parent | 52ef7fce1626868d6be34f4038cd852259ad6a26 (diff) | |
| parent | df4c977d760ccfcf929c77b100faa5f8f38df158 (diff) | |
| download | frameworks_base-ae4619dd7f3d48cae2e9b83681849a77a8201142.zip frameworks_base-ae4619dd7f3d48cae2e9b83681849a77a8201142.tar.gz frameworks_base-ae4619dd7f3d48cae2e9b83681849a77a8201142.tar.bz2 | |
am df4c977d: am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev
* commit 'df4c977d760ccfcf929c77b100faa5f8f38df158':
Move StatusBar to use statusBarColor theme attribute
Diffstat (limited to 'tools/layoutlib')
| -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); |