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

Merge "Animate clear all button's alpha after last task has scrolled beyond its edge." into tm-dev

Browse Source
This commit is contained in:
Pat Manning
2022-04-12 17:04:24 +00:00
committed by Android (Google) Code Review
parent 7013ee716d 29fbab4ddd
commit 08a408408c
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/views/ClearAllButton.java
+4 -1
View File
@@ -141,7 +141,10 @@ public class ClearAllButton extends Button {
}
applyPrimaryTranslation();
applySecondaryTranslation();
mScrollAlpha = 1 - shift / orientationSize;
float clearAllSpacing =
recentsView.getPageSpacing() + recentsView.getClearAllExtraPageSpacing();
clearAllSpacing = mIsRtl ? -clearAllSpacing : clearAllSpacing;
mScrollAlpha = Math.max((clearAllScroll + clearAllSpacing - scroll) / clearAllSpacing, 0);
updateAlpha();
}
quickstep/src/com/android/quickstep/views/RecentsView.java
+6 -5
View File
@@ -1289,10 +1289,11 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
return;
}
TaskView taskView = getTaskViewAt(mNextPage);
// Only snap to fully visible focused task.
if (taskView == null
|| !taskView.isFocusedTask()
|| !isTaskViewFullyVisible(taskView)) {
// Snap to fully visible focused task and clear all button.
boolean shouldSnapToFocusedTask = taskView != null && taskView.isFocusedTask()
&& isTaskViewFullyVisible(taskView);
boolean shouldSnapToClearAll = mNextPage == indexOfChild(mClearAllButton);
if (!shouldSnapToFocusedTask && !shouldSnapToClearAll) {
return;
}
}
@@ -4535,7 +4536,7 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
? getClearAllExtraPageSpacing() : 0;
}
private int getClearAllExtraPageSpacing() {
protected int getClearAllExtraPageSpacing() {
return showAsGrid()
? Math.max(mActivity.getDeviceProfile().overviewGridSideMargin - mPageSpacing, 0)
: 0;