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

Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
2014-05-13 10:44:24 -07:00
parent 5dae7fda38 7377c7be6a
commit 0ad4f2cedd
1 changed files with 2 additions and 0 deletions
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -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();