Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bryce Lee
2015-04-01 19:09:33 +00:00
committed by Android (Google) Code Review
parent 79c587eda4 ae41dcab07
commit 7a1454fe69
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

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