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