Snap for 6664824 from c3f0dedaa463b8b15f50145f82b5ff3a2c66617b to mainline-release
Change-Id: Ia785659c20b71e877231dc9d88c375cf40554233
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
index 987cd0f..b94e633 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/hybridhotseat/HotseatPredictionController.java
@@ -113,8 +113,6 @@
private AllAppsStore mAllAppsStore;
private AnimatorSet mIconRemoveAnimators;
private boolean mUIUpdatePaused = false;
- private boolean mRequiresCacheUpdate = true;
- private boolean mIsCacheEmpty;
private boolean mIsDestroyed = false;
@@ -350,7 +348,6 @@
fillGapsWithPrediction();
return;
}
- mIsCacheEmpty = apps.isEmpty();
int count = Math.min(ranks.size(), apps.size());
List<WorkspaceItemInfo> items = new ArrayList<>(count);
for (int i = 0; i < count; i++) {
@@ -393,14 +390,7 @@
}
updateDependencies();
fillGapsWithPrediction();
- cachePredictionComponentKeysIfNecessary(componentKeys);
- }
-
- private void cachePredictionComponentKeysIfNecessary(ArrayList<ComponentKey> componentKeys) {
- if (!mRequiresCacheUpdate && componentKeys.isEmpty() == mIsCacheEmpty) return;
mPredictionModel.cachePredictionComponentKeys(componentKeys);
- mIsCacheEmpty = componentKeys.isEmpty();
- mRequiresCacheUpdate = false;
}
private void updateDependencies() {
@@ -429,7 +419,6 @@
notifyItemAction(mPredictionModel.wrapAppTargetWithLocation(appTarget,
AppTargetEvent.ACTION_PIN, workspaceItemInfo));
}
- mRequiresCacheUpdate = true;
}
private List<WorkspaceItemInfo> mapToWorkspaceItemInfo(
@@ -583,7 +572,6 @@
}
mDragObject = null;
fillGapsWithPrediction(true, this::removeOutlineDrawings);
- mRequiresCacheUpdate = true;
}
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
index 46013d3..c9ed498 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/util/TaskViewSimulator.java
@@ -103,6 +103,7 @@
mSizeStrategy = sizeStrategy;
mOrientationState = new RecentsOrientedState(context, sizeStrategy, i -> { });
+ mOrientationState.setGestureActive(true);
mCurrentFullscreenParams = new FullscreenDrawParams(context);
mPageSpacing = context.getResources().getDimensionPixelSize(R.dimen.recents_page_spacing);
diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
index 68b8975..7b24b03 100644
--- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java
@@ -1003,7 +1003,9 @@
mDwbToastShown = false;
mActivity.getSystemUiController().updateUiState(UI_STATE_OVERVIEW, 0);
LayoutUtils.setViewEnabled(mActionsView, true);
- mOrientationState.setGestureActive(false);
+ if (mOrientationState.setGestureActive(false)) {
+ updateOrientationHandler();
+ }
}
public @Nullable TaskView getRunningTaskView() {
@@ -1041,7 +1043,10 @@
*/
public void onGestureAnimationStart(int runningTaskId) {
// This needs to be called before the other states are set since it can create the task view
- mOrientationState.setGestureActive(true);
+ if (mOrientationState.setGestureActive(true)) {
+ updateOrientationHandler();
+ }
+
showCurrentTask(runningTaskId);
setEnableFreeScroll(false);
setEnableDrawingLiveTile(false);
@@ -1104,7 +1109,9 @@
* Called when a gesture from an app has finished.
*/
public void onGestureAnimationEnd() {
- mOrientationState.setGestureActive(false);
+ if (mOrientationState.setGestureActive(false)) {
+ updateOrientationHandler();
+ }
setOnScrollChangeListener(null);
setEnableFreeScroll(true);
diff --git a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
index b359f0f..d822b6c 100644
--- a/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
+++ b/quickstep/src/com/android/quickstep/util/RecentsOrientedState.java
@@ -188,8 +188,9 @@
/**
* Sets if the swipe up gesture is currently running or not
*/
- public void setGestureActive(boolean isGestureActive) {
+ public boolean setGestureActive(boolean isGestureActive) {
setFlag(FLAG_SWIPE_UP_NOT_RUNNING, !isGestureActive);
+ return update(mTouchRotation, mDisplayRotation);
}
/**
@@ -202,27 +203,19 @@
*/
public boolean update(
@SurfaceRotation int touchRotation, @SurfaceRotation int displayRotation) {
- int recentsActivityRotation = inferRecentsActivityRotation(displayRotation);
- if (mDisplayRotation == displayRotation
- && mTouchRotation == touchRotation
- && mRecentsActivityRotation == recentsActivityRotation) {
- return false;
- }
-
- mRecentsActivityRotation = recentsActivityRotation;
+ mRecentsActivityRotation = inferRecentsActivityRotation(displayRotation);
mDisplayRotation = displayRotation;
mTouchRotation = touchRotation;
mPreviousRotation = touchRotation;
- if (mRecentsActivityRotation == mTouchRotation || canRecentsActivityRotate()) {
+ PagedOrientationHandler oldHandler = mOrientationHandler;
+ if (mRecentsActivityRotation == mTouchRotation
+ || (canRecentsActivityRotate() && (mFlags & FLAG_SWIPE_UP_NOT_RUNNING) != 0)) {
mOrientationHandler = PagedOrientationHandler.PORTRAIT;
if (DEBUG) {
Log.d(TAG, "current RecentsOrientedState: " + this);
}
- return true;
- }
-
- if (mTouchRotation == ROTATION_90) {
+ } else if (mTouchRotation == ROTATION_90) {
mOrientationHandler = PagedOrientationHandler.LANDSCAPE;
} else if (mTouchRotation == ROTATION_270) {
mOrientationHandler = PagedOrientationHandler.SEASCAPE;
@@ -232,7 +225,7 @@
if (DEBUG) {
Log.d(TAG, "current RecentsOrientedState: " + this);
}
- return true;
+ return oldHandler != mOrientationHandler;
}
@SurfaceRotation