diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 20:56:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 20:56:04 +0000 |
| commit | 31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff (patch) | |
| tree | 8f7841b116a23a9eedc7802ab32a1d8da6a45a1a | |
| parent | 1b0f605667dc286b1a1f423b43c4b6957993daaf (diff) | |
| parent | 964023c5dcd0334cdcf624eff26d791d9c9617a8 (diff) | |
| download | frameworks_base-31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff.zip frameworks_base-31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff.tar.gz frameworks_base-31a3760a49f7495e73f4de1c11f2e3f64ff9a7ff.tar.bz2 | |
am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev
* commit '964023c5dcd0334cdcf624eff26d791d9c9617a8':
Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
| -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(); |