Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df4c977d authored by Diego Perez's avatar Diego Perez Committed by Android Git Automerger
Browse files

am 24e10c0b: am 19dbe50b: Merge "Move StatusBar to use statusBarColor theme... 

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

* commit '24e10c0b':
  Move StatusBar to use statusBarColor theme attribute
parents ffeb8117 24e10c0b

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

+2 −1
Original line number Diff line number Diff line
@@ -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);