Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a1454fe authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Do not use the status bar as the system decor layer if it is not... 

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

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+8 −2
Original line number Diff line number Diff line
@@ -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;

    }