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

Merge "Remove the light flag if the bar isn't specified light in theme" into sc-dev

Browse Source
This commit is contained in:
Tiger Huang
2021-07-02 09:39:40 +00:00
committed by Android (Google) Code Review
parent b4044c5f69 0eb56cb359
commit de8ea692b1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/com/android/internal/policy/PhoneWindow.java
View File

@@ -2512,14 +2512,15 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
} }
params.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION; params.privateFlags |= PRIVATE_FLAG_NO_MOVE_ANIMATION;
} }
if (a.getBoolean(R.styleable.Window_windowLightStatusBar, false)) { final int sysUiVis = decor.getSystemUiVisibility();
final int statusLightFlag = View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR;
final int statusFlag = a.getBoolean(R.styleable.Window_windowLightStatusBar, false)
? statusLightFlag : 0;
final int navLightFlag = View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
final int navFlag = a.getBoolean(R.styleable.Window_windowLightNavigationBar, false)
? navLightFlag : 0;
decor.setSystemUiVisibility( decor.setSystemUiVisibility(
decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR); (sysUiVis & ~(statusLightFlag | navLightFlag)) | (statusFlag | navFlag));
}
if (a.getBoolean(R.styleable.Window_windowLightNavigationBar, false)) {
decor.setSystemUiVisibility(
decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
}
if (a.hasValue(R.styleable.Window_windowLayoutInDisplayCutoutMode)) { if (a.hasValue(R.styleable.Window_windowLayoutInDisplayCutoutMode)) {
int mode = a.getInt(R.styleable.Window_windowLayoutInDisplayCutoutMode, -1); int mode = a.getInt(R.styleable.Window_windowLayoutInDisplayCutoutMode, -1);
if (mode < LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT if (mode < LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT