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

Merge "Fixed that disappear animations were disabled"

Browse Source
This commit is contained in:
Selim Cinek
2015-04-16 18:55:55 +00:00
committed by Android (Google) Code Review
parent ecc53f4835 2aab2fb76e
commit 80ee14ebb4
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -220,7 +220,6 @@ public class NotificationStackScrollLayout extends ViewGroup
private PhoneStatusBar mPhoneStatusBar;
private int[] mTempInt2 = new int[2];
private boolean mGenerateChildOrderChangedEvent;
private boolean mRemoveAnimationEnabled;
private HashSet<Runnable> mAnimationFinishedRunnables = new HashSet<>();
private HashSet<Pair<ExpandableNotificationRow, Boolean>> mHeadsUpChangeAnimations
= new HashSet<>();
@@ -1630,16 +1629,11 @@ public class NotificationStackScrollLayout extends ViewGroup
((ExpandableView) child).setOnHeightChangedListener(null);
mCurrentStackScrollState.removeViewStateForView(child);
updateScrollStateForRemovedChild(child);
if (mRemoveAnimationEnabled) {
boolean animationGenerated = generateRemoveAnimation(child);
if (animationGenerated && !mSwipedOutViews.contains(child)) {
// Add this view to an overlay in order to ensure that it will still be temporary
// drawn when removed
getOverlay().add(child);
}
} else {
// TODO: handle this more cleanly when HEADS-up and the shade are merged
requestAnimateEverything();
boolean animationGenerated = generateRemoveAnimation(child);
if (animationGenerated && !mSwipedOutViews.contains(child)) {
// Add this view to an overlay in order to ensure that it will still be temporary
// drawn when removed
getOverlay().add(child);
}
updateAnimationState(false, child);
@@ -2631,10 +2625,6 @@ public class NotificationStackScrollLayout extends ViewGroup
return touchY > mIntrinsicPadding;
}
public void setRemoveAnimationEnabled(boolean enabled) {
mRemoveAnimationEnabled = enabled;
}
private void updateExpandButtons() {
for (int i = 0; i < getChildCount(); i++) {
View child = getChildAt(i);