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

Fixed a crash with HUNs

Browse Source 
Bug: 21500600
Change-Id: Idf0a7be5d58bb5c666b930a0beada1e0ed2869aa
This commit is contained in:
Selim Cinek
2015-06-01 06:11:19 -07:00
parent 60598075a0
commit 233241f13d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1655,8 +1655,13 @@ public class NotificationStackScrollLayout extends ViewGroup
* @return Whether an animation was generated.
*/
private boolean generateRemoveAnimation(View child) {
if (mAddedHeadsUpChildren.contains(child)) {
removeChildFromHeadsUpChangeAnimations(child);
mAddedHeadsUpChildren.remove(child);
return false;
}
if (mIsExpanded && mAnimationsEnabled && !isChildInInvisibleGroup(child)) {
if (!mChildrenToAddAnimated.contains(child) && !mAddedHeadsUpChildren.contains(child)) {
if (!mChildrenToAddAnimated.contains(child)) {
// Generate Animations
mChildrenToRemoveAnimated.add(child);
mNeedsAnimation = true;
@@ -1664,10 +1669,6 @@ public class NotificationStackScrollLayout extends ViewGroup
} else {
mChildrenToAddAnimated.remove(child);
mFromMoreCardAdditions.remove(child);
boolean remove = mAddedHeadsUpChildren.remove(child);
if (remove) {
removeChildFromHeadsUpChangeAnimations(child);
}
return false;
}
}