commit 2100476ace68858bc7b7356b33aa525e38795592
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 21:00:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 21:00:19 2014 +0000
tree f082969243d710a0670c8a8e1f6df455345a040c
parent 9c7e3064469e51a10503cfdf3d0215a62a3b6c8d
parent 31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff

am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev

* commit '31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]

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

diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
index 0af14dd..5e3e907 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
@@ -183,6 +183,8 @@
         SessionParams params = getParams();
         BridgeContext context = getContext();
 
+        context.getIWindowManager().setHasNavBar(params.getHardwareConfig().hasSoftwareButtons());
+
         RenderResources resources = getParams().getResources();
         DisplayMetrics metrics = getContext().getMetrics();