diff options
| author | John Spurlock <jspurlock@google.com> | 2014-09-30 16:41:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-30 16:41:14 +0000 |
| commit | ffca85400f2b8c099a77cafb1a2c20c7a36a5bb2 (patch) | |
| tree | 7319f67ee2f9550f022fc32b9f05fcd53fcee7fe /packages/SystemUI/src/com/android | |
| parent | d1b1947b89d55c953175e19ffe44e8fc4fde945b (diff) | |
| parent | a1b84165f9520c025c59f5b2d93a65d4609b8088 (diff) | |
| download | frameworks_base-ffca85400f2b8c099a77cafb1a2c20c7a36a5bb2.zip frameworks_base-ffca85400f2b8c099a77cafb1a2c20c7a36a5bb2.tar.gz frameworks_base-ffca85400f2b8c099a77cafb1a2c20c7a36a5bb2.tar.bz2 | |
am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088':
Don't play hint animations when dozing
Diffstat (limited to 'packages/SystemUI/src/com/android')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index b9efb22..26420e1 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -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; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index 07cef32..c612e4c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -915,7 +915,9 @@ public abstract class PanelView extends FrameLayout { private boolean onMiddleClicked() { switch (mStatusBar.getBarState()) { case StatusBarState.KEYGUARD: - startUnlockHintAnimation(); + 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" |