Merge "Cut the Grid-based Recents title if it's too long." into nyc-mr2-dev (e606e999) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -424,7 +424,7 @@ public class TaskStackAnimationHelper {
		final ReferenceCountedTrigger postAnimationTrigger) {
		TaskStackLayoutAlgorithm stackLayout = mStackView.getStackAlgorithm();

		int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.mTaskRect.left;
		int offscreenXOffset = mStackView.getMeasuredWidth() - stackLayout.getTaskRect().left;

		int taskViewCount = taskViews.size();
		for (int i = taskViewCount - 1; i >= 0; i--) {

+7 −0

Original line number	Diff line number	Diff line
		@@ -1320,6 +1320,13 @@ public class TaskStackLayoutAlgorithm {
		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) {
		String innerPrefix = prefix + " ";

+4 −4

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -195,4 +195,8 @@ public class TaskGridLayoutAlgorithm {
		buttonRect.bottom = buttonRect.top + mPaddingTopBottom;
		return buttonRect;
		}

		public Rect getTaskGridRect() {
		return mTaskGridRect;
		}
		}