PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Calculate ClearAllButton's scroll offset after it's laid out" into sc-dev am: 21784eaf08

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14112622

Change-Id: I779bbe504f4df9de04baae036a81f1b4385942d3
This commit is contained in:
Alex Chau
2021-04-08 21:09:27 +00:00
committed by Automerger Merge Worker
parent 27f08d961c 21784eaf08
commit 0fc65c38b9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/RecentsView.java
+7 -5
View File
@@ -1228,11 +1228,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
mClearAllButton.setFullscreenTranslationPrimary(
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);
}
@@ -3020,6 +3015,13 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
boolean pageScrollChanged = super.getPageScrolls(outPageScrolls, layoutChildren,
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();
for (int i = 0; i < childCount; i++) {
View child = getChildAt(i);