Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am:... (ed7491bd) · Commits · e / os / android_frameworks_base

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

+24 −13

Original line number	Diff line number	Diff line
		@@ -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 handled;
		return true;
		} else {
		return false;
		}

		}
		}, afterKeyguardGone);
		return true;
		@@ -6855,12 +6858,16 @@ public class StatusBar extends SystemUI implements DemoMode,
		}
		}.start();

		if (!mNotificationPanel.isFullyCollapsed()) {
		// close the shade if it was open
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
		true /* force /, true / delayed */);
		visibilityChanged(false);

		return true;
		} else {
		return false;
		}
		}
		}, afterKeyguardGone);
		}
		@@ -7012,12 +7019,16 @@ public class StatusBar extends SystemUI implements DemoMode,
		new Thread(runnable).start();
		}

		if (!mNotificationPanel.isFullyCollapsed()) {
		// close the shade if it was open
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
		true /* force /, true / delayed */);
		visibilityChanged(false);

		return true;
		} else {
		return false;
		}
		}
		}, afterKeyguardGone);
		}

+3 −1

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