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 am: c170b7ead0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16512317

Change-Id: Iaba84757dbfd6ec118fe0a56d187f35eb9d30437
This commit is contained in:
Jerry Chang
2021-12-22 07:23:47 +00:00
committed by Automerger Merge Worker
parent 3dfc3ca7aa c170b7ead0
commit e177a637dc
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

@@ -2840,8 +2840,7 @@ public class DisplayPolicy {
@VisibleForTesting @VisibleForTesting
int updateLightNavigationBarLw(int appearance, WindowState navColorWin) { int updateLightNavigationBarLw(int appearance, WindowState navColorWin) {
if (navColorWin == null || navColorWin.isDimming() if (navColorWin == null || !isLightBarAllowed(navColorWin, Type.navigationBars())) {
|| !isLightBarAllowed(navColorWin, Type.navigationBars())) {
// Clear the light flag while not allowed. // Clear the light flag while not allowed.
appearance &= ~APPEARANCE_LIGHT_NAVIGATION_BARS; appearance &= ~APPEARANCE_LIGHT_NAVIGATION_BARS;
return appearance; 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, assertEquals(0,
displayPolicy.updateLightNavigationBarLw(APPEARANCE_LIGHT_NAVIGATION_BARS, null)); 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. // Control window overrides APPEARANCE_LIGHT_NAVIGATION_BARS flag.
assertEquals(0, displayPolicy.updateLightNavigationBarLw(0, opaqueDarkNavBar)); assertEquals(0, displayPolicy.updateLightNavigationBarLw(0, opaqueDarkNavBar));
assertEquals(0, displayPolicy.updateLightNavigationBarLw( assertEquals(0, displayPolicy.updateLightNavigationBarLw(