diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 21:02:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 21:02:19 +0000 |
| commit | 900954e3cd135bf43db975961056e7661f26a6c6 (patch) | |
| tree | 564f2b4bd26af36a9f21dc9ed687580246c654c3 /tools | |
| parent | 7b9cc71063869a98f35b49c2e072750dfa46e0b9 (diff) | |
| parent | 2100476ace68858bc7b7356b33aa525e38795592 (diff) | |
| download | frameworks_base-900954e3cd135bf43db975961056e7661f26a6c6.zip frameworks_base-900954e3cd135bf43db975961056e7661f26a6c6.tar.gz frameworks_base-900954e3cd135bf43db975961056e7661f26a6c6.tar.bz2 | |
am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
* commit '2100476ace68858bc7b7356b33aa525e38795592':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java | 2 |
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 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 @@ 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(); |