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

Merge "Force-clear nav bar flags when phone finishes booting." into rvc-dev am: b236787b1a

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

Change-Id: Id75ae7d53231594d0e345ba69f5daf1e0caafcee
This commit is contained in:
TreeHugger Robot
2020-06-11 19:17:07 +00:00
committed by Automerger Merge Worker
parent 407e782488 b236787b1a
commit 6fd0d10f32
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -654,7 +654,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
@Override @Override
public void onBouncerVisiblityChanged(boolean shown) { public void onBouncerVisiblityChanged(boolean shown) {
synchronized (KeyguardViewMediator.this) { synchronized (KeyguardViewMediator.this) {
adjustStatusBarLocked(shown); adjustStatusBarLocked(shown, false);
} }
} }
@@ -2003,10 +2003,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
} }
private void adjustStatusBarLocked() { private void adjustStatusBarLocked() {
adjustStatusBarLocked(false /* forceHideHomeRecentsButtons */); adjustStatusBarLocked(false /* forceHideHomeRecentsButtons */,
false /* forceClearFlags */);
} }
private void adjustStatusBarLocked(boolean forceHideHomeRecentsButtons) { private void adjustStatusBarLocked(boolean forceHideHomeRecentsButtons,
boolean forceClearFlags) {
if (mStatusBarManager == null) { if (mStatusBarManager == null) {
mStatusBarManager = (StatusBarManager) mStatusBarManager = (StatusBarManager)
mContext.getSystemService(Context.STATUS_BAR_SERVICE); mContext.getSystemService(Context.STATUS_BAR_SERVICE);
@@ -2018,6 +2020,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
// Disable aspects of the system/status/navigation bars that must not be re-enabled by // Disable aspects of the system/status/navigation bars that must not be re-enabled by
// windows that appear on top, ever // windows that appear on top, ever
int flags = StatusBarManager.DISABLE_NONE; int flags = StatusBarManager.DISABLE_NONE;
// TODO (b/155663717) After restart, status bar will not properly hide home button
// unless disable is called to show un-hide it once first
if (forceClearFlags) {
mStatusBarManager.disable(flags);
}
if (forceHideHomeRecentsButtons || isShowingAndNotOccluded()) { if (forceHideHomeRecentsButtons || isShowingAndNotOccluded()) {
if (!mShowHomeOverLockscreen || !mInGestureNavigationMode) { if (!mShowHomeOverLockscreen || !mInGestureNavigationMode) {
flags |= StatusBarManager.DISABLE_HOME; flags |= StatusBarManager.DISABLE_HOME;
@@ -2141,6 +2150,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable {
public void onBootCompleted() { public void onBootCompleted() {
synchronized (this) { synchronized (this) {
mBootCompleted = true; mBootCompleted = true;
adjustStatusBarLocked(false, true);
if (mBootSendUserPresent) { if (mBootSendUserPresent) {
sendUserPresentBroadcast(); sendUserPresentBroadcast();
} }