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

Commit 58ff7de9 authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

Fix build. 

Change-Id: I877532b5056a035dbd4b0c6c55b5969d6292846a
parent 648a309d

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

+2 −2
Original line number Diff line number Diff line
@@ -32,13 +32,13 @@ import android.widget.TextView; 
public class StatusBar extends CustomBar {



    public StatusBar(Context context, Density density, int direction, boolean RtlEnabled,

            int simulatePlatformVersion) throws XmlPullParserException {

            int simulatedPlatformVersion) throws XmlPullParserException {

        // FIXME: if direction is RTL but it's not enabled in application manifest, mirror this bar.

        super(context, density, LinearLayout.HORIZONTAL, "/bars/status_bar.xml", "status_bar.xml");



        // FIXME: use FILL_H?

        setGravity(Gravity.START | Gravity.TOP | Gravity.RIGHT);

        setBackgroundColor(Config.getStatusBarColor(simulatePlatformVersion));

        setBackgroundColor(Config.getStatusBarColor(simulatedPlatformVersion));



        // Cannot access the inside items through id because no R.id values have been

        // created for them.

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 
                    mViewRoot = topLayout;

                    topLayout.setOrientation(LinearLayout.HORIZONTAL);



                    if (Config.showOnScreenNavBar(params.getSimulatePlatformVersion())) {

                    if (Config.showOnScreenNavBar(params.getSimulatedPlatformVersion())) {

                        try {

                            NavigationBar navigationBar = createNavigationBar(context,

                                    hardwareConfig.getDensity(), isRtl, params.isRtlSupported());
@@ -330,7 +330,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 
                    try {

                        StatusBar statusBar = createStatusBar(context, hardwareConfig.getDensity(),

                                layoutDirection, params.isRtlSupported(),

                                params.getSimulatePlatformVersion());

                                params.getSimulatedPlatformVersion());

                        topLayout.addView(statusBar);

                    } catch (XmlPullParserException ignored) {
@@ -373,7 +373,7 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 
                    backgroundLayout.addView(mContentRoot);

                }



                if (Config.showOnScreenNavBar(params.getSimulatePlatformVersion()) &&

                if (Config.showOnScreenNavBar(params.getSimulatedPlatformVersion()) &&

                        mNavigationBarOrientation == LinearLayout.HORIZONTAL &&

                        mNavigationBarSize > 0) {

                    // system bar