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 am: 9f3bac52ee

Browse Source 
am: 0870da759f

Change-Id: Iffbd44676b0c4157b040b215d35a5359c6acc509
This commit is contained in:
Adrian Roos
2017-08-07 13:54:31 +00:00
committed by android-build-merger
parent e558f21f30 0870da759f
commit 0fabec8051
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);
// close the shade if it was open
if (handled) {
if (handled && !mNotificationPanel.isFullyCollapsed()) {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */);
visibilityChanged(false);
mAssistManager.hideAssist();
// Wait for activity start.
return true;
} else {
return false;
}
// Wait for activity start.
return handled;
}
}, afterKeyguardGone);
return true;
@@ -6855,12 +6858,16 @@ public class StatusBar extends SystemUI implements DemoMode,
}
}.start();
// close the shade if it was open
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */, true /* delayed */);
visibilityChanged(false);
if (!mNotificationPanel.isFullyCollapsed()) {
// close the shade if it was open
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */, true /* delayed */);
visibilityChanged(false);
return true;
return true;
} else {
return false;
}
}
}, afterKeyguardGone);
}
@@ -7012,12 +7019,16 @@ public class StatusBar extends SystemUI implements DemoMode,
new Thread(runnable).start();
}
// close the shade if it was open
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */, true /* delayed */);
visibilityChanged(false);
if (!mNotificationPanel.isFullyCollapsed()) {
// close the shade if it was open
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */, true /* delayed */);
visibilityChanged(false);
return true;
return true;
} else {
return false;
}
}
}, 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) {
mStatusBar.hideKeyguard();
mStatusBar.stopWaitingForKeyguardExit();
hideBouncer(false /* destroyView */);
if (hideBouncerWhenShowing || mBouncer.needsFullscreenBouncer()) {
hideBouncer(false /* destroyView */);
}
} else {
showBouncerOrKeyguard(hideBouncerWhenShowing);
}