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

Commit d569feb6 authored by Jerry Chang's avatar Jerry Chang
Browse files

Fix navigation bar icon invisible with dimming window 

Make sure all windows with its frame overlapping with navigation bar can
declare light navigation bar color no matter if it's dimming or not.

Fix: 205308712
Test: atest DisplayPolicyTests
Test: verified dimming window with its frame overlapping with navigation
      bar can declare light navigation bar color.
Change-Id: I6269547f0dfcd54568fd4f07b2642258f93a2822
parent f811df0e

services/core/java/com/android/server/wm/DisplayPolicy.java

+1 −2
Original line number Diff line number Diff line
@@ -2819,8 +2819,7 @@ public class DisplayPolicy { 


    @VisibleForTesting

    int updateLightNavigationBarLw(int appearance, WindowState navColorWin) {

        if (navColorWin == null || navColorWin.isDimming()

                || !isLightBarAllowed(navColorWin, Type.navigationBars())) {

        if (navColorWin == null || !isLightBarAllowed(navColorWin, Type.navigationBars())) {

            // Clear the light flag while not allowed.

            appearance &= ~APPEARANCE_LIGHT_NAVIGATION_BARS;

            return appearance;

services/tests/wmtests/src/com/android/server/wm/DisplayPolicyTests.java

+0 −5
Original line number Diff line number Diff line
@@ -189,11 +189,6 @@ public class DisplayPolicyTests extends WindowTestsBase { 
        assertEquals(0,

                displayPolicy.updateLightNavigationBarLw(APPEARANCE_LIGHT_NAVIGATION_BARS, null));



        // Dimming window clears APPEARANCE_LIGHT_NAVIGATION_BARS.

        assertEquals(0, displayPolicy.updateLightNavigationBarLw(0, dimming));

        assertEquals(0, displayPolicy.updateLightNavigationBarLw(

                APPEARANCE_LIGHT_NAVIGATION_BARS, dimming));



        // Control window overrides APPEARANCE_LIGHT_NAVIGATION_BARS flag.

        assertEquals(0, displayPolicy.updateLightNavigationBarLw(0, opaqueDarkNavBar));

        assertEquals(0, displayPolicy.updateLightNavigationBarLw(