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

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev

Browse Source 
am: 9f3bac52ee

Change-Id: I8c17429ce2b79a3e14e7b6cbabf7b377ace44718
This commit is contained in:
Adrian Roos
2017-08-07 13:48:46 +00:00
committed by android-build-merger
parent 7a1bc55d78 9f3bac52ee
commit 27106b97b3
2 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -5797,15 +5797,18 @@ public class StatusBar extends SystemUI implements DemoMode,
boolean handled = superOnClickHandler(view, pendingIntent, fillInIntent); boolean handled = superOnClickHandler(view, pendingIntent, fillInIntent);
// close the shade if it was open // close the shade if it was open
if (handled) { if (handled && !mNotificationPanel.isFullyCollapsed()) {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */); true /* force */);
visibilityChanged(false); visibilityChanged(false);
mAssistManager.hideAssist(); mAssistManager.hideAssist();
// Wait for activity start.
return true;
} else {
return false;
} }
// Wait for activity start.
return handled;
} }
}, afterKeyguardGone); }, afterKeyguardGone);
return true; return true;
@@ -6855,12 +6858,16 @@ public class StatusBar extends SystemUI implements DemoMode,
} }
}.start(); }.start();
// close the shade if it was open if (!mNotificationPanel.isFullyCollapsed()) {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, // close the shade if it was open
true /* force */, true /* delayed */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
visibilityChanged(false); true /* force */, true /* delayed */);
visibilityChanged(false);
return true; return true;
} else {
return false;
}
} }
}, afterKeyguardGone); }, afterKeyguardGone);
} }
@@ -7012,12 +7019,16 @@ public class StatusBar extends SystemUI implements DemoMode,
new Thread(runnable).start(); new Thread(runnable).start();
} }
// close the shade if it was open if (!mNotificationPanel.isFullyCollapsed()) {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, // close the shade if it was open
true /* force */, true /* delayed */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
visibilityChanged(false); true /* force */, true /* delayed */);
visibilityChanged(false);
return true; return true;
} else {
return false;
}
} }
}, afterKeyguardGone); }, afterKeyguardGone);
} }

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

@@ -226,7 +226,9 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
if (mOccluded && !mDozing) { if (mOccluded && !mDozing) {
mStatusBar.hideKeyguard(); mStatusBar.hideKeyguard();
mStatusBar.stopWaitingForKeyguardExit(); mStatusBar.stopWaitingForKeyguardExit();
hideBouncer(false /* destroyView */); if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {
hideBouncer(false /* destroyView */);
}
} else { } else {
showBouncerOrKeyguard(hideBouncerWhenShowing); showBouncerOrKeyguard(hideBouncerWhenShowing);
} }