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

Follow up fixes for expandhelper

Browse Source 
Change-Id: I51fab5bee481889101e8f5553b9a5d9fe2cba6c3
Test: manual
This commit is contained in:
Selim Cinek
2017-01-12 11:57:11 -08:00
parent fc975d6343
commit c25af40002
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -326,7 +326,7 @@ public class ExpandHelper implements Gefingerpoken {
case MotionEvent.ACTION_CANCEL:
case MotionEvent.ACTION_UP:
if (DEBUG) Log.d(TAG, "up/cancel");
finishExpanding(ev.getActionMasked() == MotionEvent.ACTION_CANCEL,
finishExpanding(ev.getActionMasked() == MotionEvent.ACTION_CANCEL /* forceAbort */,
getCurrentVelocity());
clearView();
break;
@@ -587,6 +587,9 @@ public class ExpandHelper implements Gefingerpoken {
mFlingAnimationUtils.apply(mScaleAnimation, currentHeight, targetHeight, velocity);
mScaleAnimation.start();
} else {
if (targetHeight != currentHeight) {
mScaler.setHeight(targetHeight);
}
mCallback.setUserExpandedChild(mResizedView, nowExpanded);
mCallback.setUserLockedChild(mResizedView, false);
}