Merge changes from topic "am-fed0e088-4bd1-4b3d-8e34-49b2deb09528" into ub-launcher3-master
* changes:
[automerger] Only detect swipe directions that lead to new states am: 52240a3aa0
Only detect swipe directions that lead to new states
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 160acb5..f04101a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -453,11 +453,12 @@
mInsets.set(insets);
DeviceProfile dp = mActivity.getDeviceProfile();
getTaskSize(dp, mTempRect);
+
mTempRect.top -= getResources()
.getDimensionPixelSize(R.dimen.task_thumbnail_top_margin);
setPadding(mTempRect.left - mInsets.left, mTempRect.top - mInsets.top,
- dp.widthPx - mTempRect.right - mInsets.right,
- dp.heightPx - mTempRect.bottom - mInsets.bottom);
+ dp.availableWidthPx + mInsets.left - mTempRect.right,
+ dp.availableHeightPx + mInsets.top - mTempRect.bottom);
}
protected abstract void getTaskSize(DeviceProfile dp, Rect outRect);