summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2014-05-13 21:28:18 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-05-13 21:28:18 +0000
commit569dc64cd6b0bb7bdfec97967b192d2a706e3f81 (patch)
tree82d61b4a2688ffeea6c81c6622e7600930af75eb
parent9a3e6ec73c2188eb5bf1406b974dfc34e55722ad (diff)
parent69ab594625e274ed4ca6d4a1dc7f8fb19d44f020 (diff)
am 69ab5946: am fcfb8801: am 18b1525a: 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 '69ab594625e274ed4ca6d4a1dc7f8fb19d44f020': Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java2
1 files changed, 2 insertions, 0 deletions
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 9787432050f7..c55028b346a2 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 @@ 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();