diff options
| author | Diego Perez <diegoperez@google.com> | 2015-08-03 21:43:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-03 21:43:31 +0000 |
| commit | 126973d460a90c5cac90cf6dffee002e6248122c (patch) | |
| tree | c5876c7857ea99987f8c3e03c4197f48d4330495 | |
| parent | df776b761dfd74d11fb4ccb4355a53a717694cc5 (diff) | |
| parent | 405eceb20a3f3e7a22d922fc2d0fb8283be337fa (diff) | |
| download | frameworks_base-126973d460a90c5cac90cf6dffee002e6248122c.zip frameworks_base-126973d460a90c5cac90cf6dffee002e6248122c.tar.gz frameworks_base-126973d460a90c5cac90cf6dffee002e6248122c.tar.bz2 | |
am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev
* commit '405eceb20a3f3e7a22d922fc2d0fb8283be337fa':
Restore session params "no decoration" flag
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java index c58e312..c72c979 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/Layout.java @@ -329,9 +329,12 @@ class Layout extends RelativeLayout { mWindowIsFloating = getBooleanThemeValue(mResources, ATTR_WINDOW_FLOATING, true, true); findBackground(); - findStatusBar(); - findActionBar(); - findNavBar(); + + if (!mParams.isForceNoDecor()) { + findStatusBar(); + findActionBar(); + findNavBar(); + } } private void findBackground() { |