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

Commit 0ad4f2ce authored by Deepanshu Gupta's avatar Deepanshu Gupta
Browse files

resolved conflicts for merge of 7377c7be to jb-mr1-dev 

Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
parents 5dae7fda 7377c7be

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

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,8 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { 
        SessionParams params = getParams();

        BridgeContext context = getContext();



        context.getIWindowManager().setHasNavBar(params.getHardwareConfig().hasSoftwareButtons());



        RenderResources resources = getParams().getResources();

        DisplayMetrics metrics = getContext().getMetrics();