Merge "Don't play hint animations when dozing" into lmp-dev (a1b84165) · Commits · e / os / android_frameworks_base

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

+3 −1

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

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

+5 −1

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

		protected abstract void onEdgeClicked(boolean right);

		protected abstract boolean isDozing();

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