am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev (eac6926f) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1551,7 +1551,8 @@ public class NotificationPanelView extends PanelView implements
	@Override		@Override
	protected void onEdgeClicked(boolean right) {		protected void onEdgeClicked(boolean right) {
	if ((right && getRightIcon().getVisibility() != View.VISIBLE)		if ((right && getRightIcon().getVisibility() != View.VISIBLE)
	\|\| (!right && getLeftIcon().getVisibility() != View.VISIBLE)) {		\|\| (!right && getLeftIcon().getVisibility() != View.VISIBLE)
			\|\| isDozing()) {
	return;		return;
	}		}
	mHintAnimationRunning = true;		mHintAnimationRunning = true;
	@@ -1747,6 +1748,7 @@ public class NotificationPanelView extends PanelView implements
	updateKeyguardStatusBarVisibility();		updateKeyguardStatusBarVisibility();
	}		}

			@Override
	public boolean isDozing() {		public boolean isDozing() {
	return mDozing;		return mDozing;
	}		}

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -915,7 +915,9 @@ public abstract class PanelView extends FrameLayout {
	private boolean onMiddleClicked() {		private boolean onMiddleClicked() {
	switch (mStatusBar.getBarState()) {		switch (mStatusBar.getBarState()) {
	case StatusBarState.KEYGUARD:		case StatusBarState.KEYGUARD:
			if (!isDozing()) {
	startUnlockHintAnimation();		startUnlockHintAnimation();
			}
	return true;		return true;
	case StatusBarState.SHADE_LOCKED:		case StatusBarState.SHADE_LOCKED:
	mStatusBar.goToKeyguard();		mStatusBar.goToKeyguard();
	@@ -933,6 +935,8 @@ public abstract class PanelView extends FrameLayout {

	protected abstract void onEdgeClicked(boolean right);		protected abstract void onEdgeClicked(boolean right);

			protected abstract boolean isDozing();

	public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
	pw.println(String.format("[PanelView(%s): expandedHeight=%f maxPanelHeight=%d closing=%s"		pw.println(String.format("[PanelView(%s): expandedHeight=%f maxPanelHeight=%d closing=%s"
	+ " tracking=%s justPeeked=%s peekAnim=%s%s timeAnim=%s%s touchDisabled=%s"		+ " tracking=%s justPeeked=%s peekAnim=%s%s timeAnim=%s%s touchDisabled=%s"