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

Merge "Fix navigation bar icon invisible with dimming window" into sc-v2-dev

Browse Source
This commit is contained in:
Jerry Chang
2021-12-22 07:12:43 +00:00
committed by Android (Google) Code Review
parent 818978d5f4 d569feb6be
commit c170b7ead0
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -2853,8 +2853,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;

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

@@ -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(