Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am eac6926f: am 260e6d54: am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev

Browse Source 
* commit 'eac6926f0cb260339ec7ec2495964331249338e2':
  Don't play hint animations when dozing
This commit is contained in:
John Spurlock
2014-10-01 17:00:10 +00:00
committed by Android Git Automerger
parent 81ab90f217 eac6926f0c
commit 9a4fc6aab9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
} }

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
View File

@@ -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:
startUnlockHintAnimation(); if (!isDozing()) {
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"