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

Commit 19dbe50b authored by Diego Perez's avatar Diego Perez Committed by Android (Google) Code Review
Browse files

Merge "Move StatusBar to use statusBarColor theme attribute" into lmp-mr1-dev

parents bc47abe4 d0546353

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);