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

DirectReply: Show bouncer when occluded

Browse Source 
am: f37fce5182

Change-Id: Ib3f82893fe744a3d382841e17e5a8e8dc1c3c19b
This commit is contained in:
Adrian Roos
2016-12-15 22:37:00 +00:00
committed by android-build-merger
parent 763ab36642 f37fce5182
commit ad0ed5c63c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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,12 +4438,16 @@ 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) {
showBouncer();
}
}
private void showBouncer() {
mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing(); mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
mStatusBarKeyguardViewManager.dismiss(); mStatusBarKeyguardViewManager.dismiss();
} }
}
private void instantExpandNotificationsPanel() { private void instantExpandNotificationsPanel() {
@@ -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 {