drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev

Browse Source 
* commit '19dbe50bb534db6fa46f0df47f589a69212e9458':
  Move StatusBar to use statusBarColor theme attribute
This commit is contained in:
Diego Perez
2015-05-06 23:53:45 +00:00
committed by Android Git Automerger
parent 9c13c8de82 19dbe50bb5
commit 24e10c0bad
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/StatusBar.java
View File

@ -39,7 +39,7 @@ public class StatusBar extends CustomBar {
private final int mSimulatedPlatformVersion; private final int mSimulatedPlatformVersion;
/** Status bar background color attribute name. */ /** 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, public StatusBar(BridgeContext context, Density density, int direction, boolean RtlEnabled,
int simulatedPlatformVersion) throws XmlPullParserException { int simulatedPlatformVersion) throws XmlPullParserException {
@ -50,6 +50,7 @@ public class StatusBar extends CustomBar {
// FIXME: use FILL_H? // FIXME: use FILL_H?
setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT); setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT);
int color = getThemeAttrColor(ATTR_COLOR, true); int color = getThemeAttrColor(ATTR_COLOR, true);
setBackgroundColor(color == 0 ? Config.getStatusBarColor(simulatedPlatformVersion) : color); setBackgroundColor(color == 0 ? Config.getStatusBarColor(simulatedPlatformVersion) : color);