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

Merge "Fixed the motion when expanding notification groups" into nyc-dev

Browse Source
This commit is contained in:
Selim Cinek
2016-03-17 17:27:42 +00:00
committed by Android (Google) Code Review
parent fb3f3f5b28 d191a1789e
commit e17595b00c
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/ExpandHelper.java
View File

@@ -535,31 +535,43 @@ public class ExpandHelper implements Gefingerpoken {
boolean nowExpanded; boolean nowExpanded;
int naturalHeight = mScaler.getNaturalHeight(); int naturalHeight = mScaler.getNaturalHeight();
if (wasClosed) { if (wasClosed) {
nowExpanded = (force || currentHeight > mOldHeight); nowExpanded = (force || currentHeight > mOldHeight && velocity >= 0);
} else { } else {
nowExpanded = !force && currentHeight >= mOldHeight; nowExpanded = !force && (currentHeight >= mOldHeight || velocity > 0);
} }
nowExpanded |= mNaturalHeight == mSmallSize; nowExpanded |= mNaturalHeight == mSmallSize;
if (mScaleAnimation.isRunning()) { if (mScaleAnimation.isRunning()) {
mScaleAnimation.cancel(); mScaleAnimation.cancel();
} }
mCallback.setUserExpandedChild(mResizedView, nowExpanded);
mCallback.expansionStateChanged(false); mCallback.expansionStateChanged(false);
float targetHeight = nowExpanded ? naturalHeight : mSmallSize; float targetHeight = nowExpanded ? naturalHeight : mSmallSize;
if (targetHeight != currentHeight) { if (targetHeight != currentHeight) {
mScaleAnimation.setFloatValues(targetHeight); mScaleAnimation.setFloatValues(targetHeight);
mScaleAnimation.setupStartValues(); mScaleAnimation.setupStartValues();
final View scaledView = mResizedView; final View scaledView = mResizedView;
final boolean expand = nowExpanded;
mScaleAnimation.addListener(new AnimatorListenerAdapter() { mScaleAnimation.addListener(new AnimatorListenerAdapter() {
public boolean mCancelled;
@Override @Override
public void onAnimationEnd(Animator animation) { public void onAnimationEnd(Animator animation) {
if (!mCancelled) {
mCallback.setUserExpandedChild(scaledView, expand);
}
mCallback.setUserLockedChild(scaledView, false); mCallback.setUserLockedChild(scaledView, false);
mScaleAnimation.removeListener(this); mScaleAnimation.removeListener(this);
} }
@Override
public void onAnimationCancel(Animator animation) {
mCancelled = true;
}
}); });
velocity = nowExpanded == velocity >= 0 ? velocity : 0;
mFlingAnimationUtils.apply(mScaleAnimation, currentHeight, targetHeight, velocity); mFlingAnimationUtils.apply(mScaleAnimation, currentHeight, targetHeight, velocity);
mScaleAnimation.start(); mScaleAnimation.start();
} else { } else {
mCallback.setUserExpandedChild(mResizedView, nowExpanded);
mCallback.setUserLockedChild(mResizedView, false); mCallback.setUserLockedChild(mResizedView, false);
} }