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

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

+24 −13

Original line number	Original line	Diff line number	Diff line
	@@ -5786,15 +5786,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.		// Wait for activity start.
	return handled;		return true;
			} else {
			return false;
			}

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

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

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

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

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

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

+3 −1

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