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

Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-07-05 17:36:41 +00:00
committed by Android (Google) Code Review
parent 71e0a3758f 5105204d26
commit 890c430416
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2589,9 +2589,6 @@ public class NotificationStackScrollLayout extends ViewGroup
} }
updateAnimationState(false, child); updateAnimationState(false, child);
// Make sure the clipRect we might have set is removed
expandableView.setClipTopAmount(0);
focusNextViewIfFocused(child); focusNextViewIfFocused(child);
} }
@@ -3038,10 +3035,6 @@ public class NotificationStackScrollLayout extends ViewGroup
private void generateChildRemovalEvents() { private void generateChildRemovalEvents() {
for (View child : mChildrenToRemoveAnimated) { for (View child : mChildrenToRemoveAnimated) {
boolean childWasSwipedOut = mSwipedOutViews.contains(child); boolean childWasSwipedOut = mSwipedOutViews.contains(child);
int animationType = childWasSwipedOut
? AnimationEvent.ANIMATION_TYPE_REMOVE_SWIPED_OUT
: AnimationEvent.ANIMATION_TYPE_REMOVE;
AnimationEvent event = new AnimationEvent(child, animationType);
// we need to know the view after this one // we need to know the view after this one
float removedTranslation = child.getTranslationY(); float removedTranslation = child.getTranslationY();
@@ -3052,7 +3045,16 @@ public class NotificationStackScrollLayout extends ViewGroup
removedTranslation = row.getTranslationWhenRemoved(); removedTranslation = row.getTranslationWhenRemoved();
ignoreChildren = false; ignoreChildren = false;
} }
childWasSwipedOut |= Math.abs(row.getTranslation()) == row.getWidth();
} }
if (!childWasSwipedOut) {
Rect clipBounds = child.getClipBounds();
childWasSwipedOut = clipBounds.height() == 0;
}
int animationType = childWasSwipedOut
? AnimationEvent.ANIMATION_TYPE_REMOVE_SWIPED_OUT
: AnimationEvent.ANIMATION_TYPE_REMOVE;
AnimationEvent event = new AnimationEvent(child, animationType);
event.viewAfterChangingView = getFirstChildBelowTranlsationY(removedTranslation, event.viewAfterChangingView = getFirstChildBelowTranlsationY(removedTranslation,
ignoreChildren); ignoreChildren);
mAnimationEvents.add(event); mAnimationEvents.add(event);