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

DirectReply: Show bouncer when occluded

Browse Source 
Fixes a bug where Direct Reply would not work when the
lockscreen is occluded.

Change-Id: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Merged-In: I064f0367b19ea3572e7bafff7ae532baddbfbedb
Fixes: 32558539
Test: Open navigation, lock phone, turn phone on, direct reply to a notification
This commit is contained in:
Adrian Roos
2016-12-13 15:12:02 -08:00
parent 52a9e0e1dd
commit f37fce5182
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(); runPostCollapseRunnables();
setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false); setInteracting(StatusBarManager.WINDOW_STATUS_BAR, false);
showBouncer(); showBouncerIfKeyguard();
recomputeDisableFlags(true /* animate */); recomputeDisableFlags(true /* animate */);
// Trimming will happen later if Keyguard is showing - doing it here might cause a jank in // 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; return false;
} }
private void showBouncer() { private void showBouncerIfKeyguard() {
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing(); showBouncer();
mStatusBarKeyguardViewManager.dismiss();
} }
} }
private void showBouncer() {
mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
mStatusBarKeyguardViewManager.dismiss();
}
private void instantExpandNotificationsPanel() { private void instantExpandNotificationsPanel() {
// Make our window larger and the panel expanded. // Make our window larger and the panel expanded.
@@ -4541,7 +4545,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public void onTrackingStopped(boolean expand) { public void onTrackingStopped(boolean expand) {
if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) { if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
if (!expand && !mUnlockMethodCache.canSkipBouncer()) { if (!expand && !mUnlockMethodCache.canSkipBouncer()) {
showBouncer(); showBouncerIfKeyguard();
} }
} }
} }
@@ -4632,7 +4636,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
|| !mShowLockscreenNotifications || mFalsingManager.shouldEnforceBouncer(); || !mShowLockscreenNotifications || mFalsingManager.shouldEnforceBouncer();
if (isLockscreenPublicMode() && fullShadeNeedsBouncer) { if (isLockscreenPublicMode() && fullShadeNeedsBouncer) {
mLeaveOpenOnKeyguardHide = true; mLeaveOpenOnKeyguardHide = true;
showBouncer(); showBouncerIfKeyguard();
mDraggedDownRow = row; mDraggedDownRow = row;
mPendingRemoteInputView = null; mPendingRemoteInputView = null;
} else { } else {