am a1b84165: Merge "Don\'t play hint animations when dozing" into lmp-dev
* commit 'a1b84165f9520c025c59f5b2d93a65d4609b8088': Don't play hint animations when dozing
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user