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

This commit is contained in:
Bryce Lee
2015-04-01 19:09:33 +00:00
committed by Android (Google) Code Review

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;
}