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

* commit 'ef24a5091b63fb512d4ca9eb34df6394c3842d33':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-05-13 21:12:39 +00:00
committed by Android Git Automerger

View File

@@ -183,6 +183,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();