Merge "AOD: Fix shelf animating when it should not" into oc-dr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2b7fbd010e
@@ -3714,6 +3714,9 @@ public class NotificationStackScrollLayout extends ViewGroup
|
|||||||
* See {@link AmbientState#setDark}.
|
* See {@link AmbientState#setDark}.
|
||||||
*/
|
*/
|
||||||
public void setDark(boolean dark, boolean animate, @Nullable PointF touchWakeUpScreenLocation) {
|
public void setDark(boolean dark, boolean animate, @Nullable PointF touchWakeUpScreenLocation) {
|
||||||
|
if (mAmbientState.isDark() == dark) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
mAmbientState.setDark(dark);
|
mAmbientState.setDark(dark);
|
||||||
if (animate && mAnimationsEnabled) {
|
if (animate && mAnimationsEnabled) {
|
||||||
mDarkNeedsAnimation = true;
|
mDarkNeedsAnimation = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user