am 7eeaad24: am 7a1454fe: Merge "Do not use the status bar as the system decor layer if it is not visible." into lmp-mr1-modular-dev

* commit '7eeaad244cbd3ac49530b414fda29d8b23fae8ae':
  Do not use the status bar as the system decor layer if it is not visible.
This commit is contained in:
Bryce Lee
2015-04-01 19:27:27 +00:00
committed by Android Git Automerger

View File

@@ -3508,8 +3508,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
/** {@inheritDoc} */
@Override
public int getSystemDecorLayerLw() {
if (mStatusBar != null) return mStatusBar.getSurfaceLayer();
if (mNavigationBar != null) return mNavigationBar.getSurfaceLayer();
if (mStatusBar != null && mStatusBar.isVisibleLw()) {
return mStatusBar.getSurfaceLayer();
}
if (mNavigationBar != null && mNavigationBar.isVisibleLw()) {
return mNavigationBar.getSurfaceLayer();
}
return 0;
}