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

Merge "Fixed that the shelf was animating the icons" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-11 02:14:52 +00:00
committed by Android (Google) Code Review
parent 7ffdc86b95 2fce3c8c28
commit 214f4cff15
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java
View File

@@ -70,6 +70,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
private float mMaxShelfEnd;
private int mRelativeOffset;
private boolean mInteractive;
private float mOpenedAmount;
private boolean mNoAnimationsInThisFrame;
private boolean mAnimationsEnabled = true;
public NotificationShelf(Context context, AttributeSet attrs) {
@@ -367,7 +369,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
} else {
// We take the clamped position instead
transitionAmount = clampedAmount;
iconState.needsCannedAnimation = iconState.clampedAppearAmount != clampedAmount;
iconState.needsCannedAnimation = iconState.clampedAppearAmount != clampedAmount
&& !mNoAnimationsInThisFrame;
}
iconState.iconAppearAmount = !USE_ANIMATIONS_WHEN_OPENING
|| iconState.useFullTransitionAmount
@@ -505,6 +508,8 @@ public class NotificationShelf extends ActivatableNotificationView implements
}
private void setOpenedAmount(float openedAmount) {
mNoAnimationsInThisFrame = openedAmount == 1.0f && mOpenedAmount == 0.0f;
mOpenedAmount = openedAmount;
if (!mAmbientState.isPanelFullWidth()) {
// We don't do a transformation at all, lets just assume we are fully opened
openedAmount = 1.0f;