Merge "Not hinting anymore when in power saver" into oc-mr1-dev

This commit is contained in:
TreeHugger Robot
2017-08-25 03:41:40 +00:00
committed by Android (Google) Code Review

View File

@@ -32,6 +32,7 @@ import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Rect; import android.graphics.Rect;
import android.os.PowerManager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.FloatProperty; import android.util.FloatProperty;
import android.util.MathUtils; import android.util.MathUtils;
@@ -108,6 +109,7 @@ public class NotificationPanelView extends PanelView implements
return object.mDarkAmount; return object.mDarkAmount;
} }
}; };
private final PowerManager mPowerManager;
private KeyguardAffordanceHelper mAffordanceHelper; private KeyguardAffordanceHelper mAffordanceHelper;
private KeyguardUserSwitcher mKeyguardUserSwitcher; private KeyguardUserSwitcher mKeyguardUserSwitcher;
@@ -242,6 +244,7 @@ public class NotificationPanelView extends PanelView implements
super(context, attrs); super(context, attrs);
setWillNotDraw(!DEBUG); setWillNotDraw(!DEBUG);
mFalsingManager = FalsingManager.getInstance(context); mFalsingManager = FalsingManager.getInstance(context);
mPowerManager = context.getSystemService(PowerManager.class);
} }
public void setStatusBar(StatusBar bar) { public void setStatusBar(StatusBar bar) {
@@ -1974,6 +1977,11 @@ public class NotificationPanelView extends PanelView implements
@Override @Override
protected void startUnlockHintAnimation() { protected void startUnlockHintAnimation() {
if (mPowerManager.isPowerSaveMode()) {
onUnlockHintStarted();
onUnlockHintFinished();
return;
}
super.startUnlockHintAnimation(); super.startUnlockHintAnimation();
startHighlightIconAnimation(getCenterIcon()); startHighlightIconAnimation(getCenterIcon());
} }