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

Merge "DirectReply: Show bouncer when occluded" into nyc-mr2-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-12-15 22:22:53 +00:00
committed by Android (Google) Code Review
parent a14aa31ef5 f37fce5182
commit 23c46fb117
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -2913,7 +2913,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
runPostCollapseRunnables();
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
showBouncer();
showBouncerIfKeyguard();
recomputeDisableFlags(true /* animate */);
// Trimming will happen later if Keyguard is showing - doing it here might cause a jank in
@@ -4438,13 +4438,17 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
return false;
}
private void showBouncer() {
private void showBouncerIfKeyguard() {
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
mStatusBarKeyguardViewManager.dismiss();
showBouncer();
}
}
private void showBouncer() {
mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
mStatusBarKeyguardViewManager.dismiss();
}
private void instantExpandNotificationsPanel() {
// Make our window larger and the panel expanded.
@@ -4541,7 +4545,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public void onTrackingStopped(boolean expand) {
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
if (!expand && !mUnlockMethodCache.canSkipBouncer()) {
showBouncer();
showBouncerIfKeyguard();
}
}
}
@@ -4632,7 +4636,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
|| !mShowLockscreenNotifications || mFalsingManager.shouldEnforceBouncer();
if (isLockscreenPublicMode() && fullShadeNeedsBouncer) {
mLeaveOpenOnKeyguardHide = true;
showBouncer();
showBouncerIfKeyguard();
mDraggedDownRow = row;
mPendingRemoteInputView = null;
} else {