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

Merge "AOD: Fix navbar flicker when launching assistant" into oc-dr1-dev

Browse Source 
am: bd27fd7368

Change-Id: I714c7cfc4b021a7292e0219217d05a59c66c7ba0
This commit is contained in:
Adrian Roos
2017-08-04 22:53:22 +00:00
committed by android-build-merger
parent d2e8a019a4 bd27fd7368
commit 28014fced0
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -201,7 +201,7 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
*/ */
public void reset(boolean hideBouncerWhenShowing) { public void reset(boolean hideBouncerWhenShowing) {
if (mShowing) { if (mShowing) {
if (mOccluded) { if (mOccluded && !mDozing) {
mStatusBar.hideKeyguard(); mStatusBar.hideKeyguard();
mStatusBar.stopWaitingForKeyguardExit(); mStatusBar.stopWaitingForKeyguardExit();
mBouncer.hide(false /* destroyView */); mBouncer.hide(false /* destroyView */);
@@ -294,9 +294,12 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
} }
mStatusBarWindowManager.setKeyguardOccluded(occluded); mStatusBarWindowManager.setKeyguardOccluded(occluded);
// If Keyguard is reshown, don't hide the bouncer as it might just have been requested by // setDozing(false) will call reset once we stop dozing.
// a FLAG_DISMISS_KEYGUARD_ACTIVITY. if (!mDozing) {
reset(false /* hideBouncerWhenShowing*/); // If Keyguard is reshown, don't hide the bouncer as it might just have been requested
// by a FLAG_DISMISS_KEYGUARD_ACTIVITY.
reset(false /* hideBouncerWhenShowing*/);
}
if (animate && !occluded && mShowing) { if (animate && !occluded && mShowing) {
mStatusBar.animateKeyguardUnoccluding(); mStatusBar.animateKeyguardUnoccluding();
} }