diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 17:58:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 17:58:14 +0000 |
| commit | 8bf73eae6c98532c8a597b885b948b9878555441 (patch) | |
| tree | d8d44a76b049f12fc4f69f6aa141b89f790071fd /tools/layoutlib | |
| parent | 5454be00b182b206bbc9dcd35b88da63631f7e8e (diff) | |
| parent | 0ad4f2cedde037c2b09a7f09c5f95f0984267c64 (diff) | |
| download | frameworks_base-8bf73eae6c98532c8a597b885b948b9878555441.zip frameworks_base-8bf73eae6c98532c8a597b885b948b9878555441.tar.gz frameworks_base-8bf73eae6c98532c8a597b885b948b9878555441.tar.bz2 | |
am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
* commit '0ad4f2cedde037c2b09a7f09c5f95f0984267c64':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
Diffstat (limited to 'tools/layoutlib')
| -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 28bc239..4329f5f 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 @@ -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(); |