Merge "2D Recents: Keep nav bar hidden from transition thumbnail" into nyc-mr2-dev

This commit is contained in:
Manu Cornet
2017-01-31 23:27:03 +00:00
committed by Android (Google) Code Review

View File

@@ -1105,8 +1105,10 @@ public class AppTransition implements Dump {
// We scale the width and clip to the top/left square
float scale = thumbWidth /
(appWidth - contentInsets.left - contentInsets.right);
int unscaledThumbHeight = (int) (thumbHeight / scale);
mTmpFromClipRect.bottom = mTmpFromClipRect.top + unscaledThumbHeight;
if (!mGridLayoutRecentsEnabled) {
int unscaledThumbHeight = (int) (thumbHeight / scale);
mTmpFromClipRect.bottom = mTmpFromClipRect.top + unscaledThumbHeight;
}
mNextAppTransitionInsets.set(contentInsets);