Snap for 7243657 from 31ff828ce1 to tm-release

Change-Id: Idaf2507e158a1e552e9475bc06b756ee53c813a1
This commit is contained in:
android-build-team Robot committed 2021-03-30 03:07:33 +00:00
commit ff4b29b52f
2 files changed
+14 -9

No files matched your search

@@ -114,11 +114,6 @@ public final class DigitalWellBeingToast {
public void initialize(Task task) {
mTask = task;
if (task.key.userId != UserHandle.myUserId()) {
setNoLimit();
return;
}
THREAD_POOL_EXECUTOR.execute(() -> {
final AppUsageLimit usageLimit = mLauncherApps.getAppUsageLimit(
task.getTopComponent().getPackageName(),
@@ -355,6 +355,8 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
// The GestureEndTarget that is still in progress.
private GestureState.GestureEndTarget mCurrentGestureEndTarget;
IntSet mTopIdSet = new IntSet();
/**
* TODO: Call reloadIdNeeded in onTaskStackChanged.
*/
@@ -1201,7 +1203,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
fullscreenTranslations[i] - fullscreenTranslations[firstNonHomeTaskIndex]);
}
updateGridProperties();
updateGridProperties(false);
}
public void getTaskSize(Rect outRect) {
@@ -1674,7 +1676,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
* This method only calculates the potential position and depends on {@link #setGridProgress} to
* apply the actual scaling and translation.
*/
private void updateGridProperties() {
private void updateGridProperties(boolean isTaskDismissal) {
int taskCount = getTaskViewCount();
if (taskCount == 0) {
return;
@@ -1690,6 +1692,10 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
IntSet bottomSet = new IntSet();
float[] gridTranslations = new float[taskCount];
int firstNonHomeTaskIndex = 0;
if (!isTaskDismissal) {
mTopIdSet.clear();
}
for (int i = 0; i < taskCount; i++) {
TaskView taskView = getTaskViewAt(i);
if (isHomeTask(taskView)) {
@@ -1699,10 +1705,14 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
continue;
}
if (topRowWidth <= bottomRowWidth) {
// Evenly distribute tasks between rows unless rearranging due to task dismissal, in
// which case keep tasks in their respective rows.
if ((!isTaskDismissal && topRowWidth <= bottomRowWidth) || (isTaskDismissal && mTopIdSet
.contains(taskView.getTask().key.id))) {
gridTranslations[i] += topAccumulatedTranslationX;
topRowWidth += taskView.getLayoutParams().width + mPageSpacing;
topSet.add(i);
mTopIdSet.add(taskView.getTask().key.id);
taskView.setGridTranslationY(0);
@@ -2066,7 +2076,7 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
} else {
snapToPageImmediately(pageToSnapTo);
// Grid got messed up, reapply.
updateGridProperties();
updateGridProperties(true);
}
// Update the layout synchronously so that the position of next view is
// immediately available.