Merge "Calculate ClearAllButton's scroll offset after it's laid out" into sc-dev (21784eaf) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/views/RecentsView.java

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1228,11 +1228,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
	mClearAllButton.setFullscreenTranslationPrimary(		mClearAllButton.setFullscreenTranslationPrimary(
	accumulatedTranslationX - fullscreenTranslations[firstNonHomeTaskIndex]);		accumulatedTranslationX - fullscreenTranslations[firstNonHomeTaskIndex]);

	// Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
	// TaskViews.
	int clearAllWidthDiff = mTaskWidth - mClearAllButton.getWidth();
	mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);

	updateGridProperties(false);		updateGridProperties(false);
	}		}

	@@ -3020,6 +3015,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
	boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,		boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
	scrollLogic);		scrollLogic);

			// Align ClearAllButton to the left (RTL) or right (non-RTL), which is different from other
			// TaskViews. This must be called after laying out ClearAllButton.
			if (layoutChildren) {
			int clearAllWidthDiff = mTaskWidth - mClearAllButton.getWidth();
			mClearAllButton.setScrollOffsetPrimary(mIsRtl ? clearAllWidthDiff : -clearAllWidthDiff);
			}

	final int childCount = getChildCount();		final int childCount = getChildCount();
	for (int i = 0; i < childCount; i++) {		for (int i = 0; i < childCount; i++) {
	View child = getChildAt(i);		View child = getChildAt(i);