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

Cut the Grid-based Recents title if it's too long.

Browse Source 
Bug: 33847657
Bug: 32101881
Change-Id: I040dafcb37c9259dded8fa2cd896e4e4a59aeae5
This commit is contained in:
Jiaquan He
2016-12-27 15:38:44 -08:00
parent 26f637b555
commit 8f34df423d
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackAnimationHelper.java
View File

@@ -424,7 +424,7 @@ public class TaskStackAnimationHelper {
final ReferenceCountedTrigger postAnimationTrigger) { final ReferenceCountedTrigger postAnimationTrigger) {
TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm(); TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm();
int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.mTaskRect.left; int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.getTaskRect().left;
int taskViewCount = taskViews.size(); int taskViewCount = taskViews.size();
for (int i = taskViewCount - 1; i >= 0; i--) { for (int i = taskViewCount - 1; i >= 0; i--) {

7
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackLayoutAlgorithm.java
View File

@@ -1320,6 +1320,13 @@ public class TaskStackLayoutAlgorithm {
mFrontOfStackTransform.visible = true; mFrontOfStackTransform.visible = true;
} }
/**
* Returns the proper task rectangle according to the current grid state.
*/
public Rect getTaskRect() {
return mGridState.useGridLayout() ? mTaskGridLayoutAlgorithm.getTaskGridRect() : mTaskRect;
}
public void dump(String prefix, PrintWriter writer) { public void dump(String prefix, PrintWriter writer) {
String innerPrefix = prefix + " "; String innerPrefix = prefix + " ";

8
packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
View File

@@ -1268,8 +1268,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
if (tv.getBackground() != null) { if (tv.getBackground() != null) {
tv.getBackground().getPadding(padding); tv.getBackground().getPadding(padding);
} }
mTmpRect.set(mStableLayoutAlgorithm.mTaskRect); mTmpRect.set(mStableLayoutAlgorithm.getTaskRect());
mTmpRect.union(mLayoutAlgorithm.mTaskRect); mTmpRect.union(mLayoutAlgorithm.getTaskRect());
tv.measure( tv.measure(
MeasureSpec.makeMeasureSpec(mTmpRect.width() + padding.left + padding.right, MeasureSpec.makeMeasureSpec(mTmpRect.width() + padding.left + padding.right,
MeasureSpec.EXACTLY), MeasureSpec.EXACTLY),
@@ -1314,8 +1314,8 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
if (tv.getBackground() != null) { if (tv.getBackground() != null) {
tv.getBackground().getPadding(padding); tv.getBackground().getPadding(padding);
} }
mTmpRect.set(mStableLayoutAlgorithm.mTaskRect); mTmpRect.set(mStableLayoutAlgorithm.getTaskRect());
mTmpRect.union(mLayoutAlgorithm.mTaskRect); mTmpRect.union(mLayoutAlgorithm.getTaskRect());
tv.cancelTransformAnimation(); tv.cancelTransformAnimation();
tv.layout(mTmpRect.left - padding.left, mTmpRect.top - padding.top, tv.layout(mTmpRect.left - padding.left, mTmpRect.top - padding.top,
mTmpRect.right + padding.right, mTmpRect.bottom + padding.bottom); mTmpRect.right + padding.right, mTmpRect.bottom + padding.bottom);

4
packages/SystemUI/src/com/android/systemui/recents/views/grid/TaskGridLayoutAlgorithm.java
View File

@@ -195,4 +195,8 @@ public class TaskGridLayoutAlgorithm {
buttonRect.bottom = buttonRect.top + mPaddingTopBottom; buttonRect.bottom = buttonRect.top + mPaddingTopBottom;
return buttonRect; return buttonRect;
} }
public Rect getTaskGridRect() {
return mTaskGridRect;
}
} }