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

am b1d7d579: Fixed a bug when a notification was quickly added and removed.

Browse Source 
* commit 'b1d7d579dc6845cce61107858f8445e0f7dbb770':
  Fixed a bug when a notification was quickly added and removed.
This commit is contained in:
Selim Cinek
2014-05-01 21:15:29 +00:00
committed by Android Git Automerger
parent e3d116a192 f4c1996d01
commit bad049f2bf
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,11 +265,8 @@ public class NotificationStackScrollLayout extends ViewGroup
mStackScrollAlgorithm.getStackScrollState(mCurrentStackScrollState);
if (!isCurrentlyAnimating() && !mChildHierarchyDirty) {
applyCurrentState();
if (mListener != null) {
mListener.onChildLocationsChanged(this);
}
} else {
startAnimationToState(mCurrentStackScrollState);
startAnimationToState();
}
}
@@ -831,9 +828,13 @@ public class NotificationStackScrollLayout extends ViewGroup
updateScrollStateForRemovedChild(child);
if (mIsExpanded) {
// Generate Animations
mChildrenToRemoveAnimated.add(child);
mChildHierarchyDirty = true;
if (!mChildrenToAddAnimated.contains(child)) {
// Generate Animations
mChildrenToRemoveAnimated.add(child);
mChildHierarchyDirty = true;
} else {
mChildrenToAddAnimated.remove(child);
}
}
}
@@ -905,12 +906,16 @@ public class NotificationStackScrollLayout extends ViewGroup
}
}
private void startAnimationToState(StackScrollState finalState) {
private void startAnimationToState() {
if (mChildHierarchyDirty) {
generateChildHierarchyEvents();
mChildHierarchyDirty = false;
}
mStateAnimator.startAnimationForEvents(mAnimationEvents, finalState);
if (!mAnimationEvents.isEmpty()) {
mStateAnimator.startAnimationForEvents(mAnimationEvents, mCurrentStackScrollState);
} else {
applyCurrentState();
}
}
private void generateChildHierarchyEvents() {
@@ -1128,6 +1133,9 @@ public class NotificationStackScrollLayout extends ViewGroup
mListenForHeightChanges = false;
mCurrentStackScrollState.apply();
mListenForHeightChanges = true;
if (mListener != null) {
mListener.onChildLocationsChanged(this);
}
}
/**