Merge "Fix multi-window enter animation" into nyc-dev am: 0c54d2c391

am: 8ff8259ca4

* commit '8ff8259ca40d72e4288ce2ddc8cb7cb4270c2ed9':
  Fix multi-window enter animation

Change-Id: I32393099407a36c3c7125435eaa4dbeb7f4518ef
This commit is contained in:
Jorim Jaggi
2016-05-31 20:23:22 +00:00
committed by android-build-merger

View File

@@ -1064,6 +1064,14 @@ public class DividerView extends FrameLayout implements OnTouchListener,
int position = DockedDividerUtils.calculatePositionForBounds(event.initialRect,
mDockSide, mDividerSize);
mEntranceAnimationRunning = true;
// Insets might not have been fetched yet, so fetch manually if needed.
if (mStableInsets.isEmpty()) {
SystemServicesProxy.getInstance(mContext).getStableInsets(mStableInsets);
mSnapAlgorithm = null;
initializeSnapAlgorithm();
}
resizeStack(position, mSnapAlgorithm.getMiddleTarget().position,
mSnapAlgorithm.getMiddleTarget());
}