Merge "Removing support for capturing assist structure on swipe up" into ub-launcher3-master
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java
index 4eda454..3602508 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java
@@ -82,7 +82,6 @@
public void onStateDisabled(Launcher launcher) {
RecentsView rv = launcher.getOverviewPanel();
rv.setOverviewStateEnabled(false);
- RecentsModel.INSTANCE.get(launcher).resetAssistCache();
}
@Override
diff --git a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
index 63d2531..0c20bd1 100644
--- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
+++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java
@@ -296,26 +296,12 @@
listenerSet.addListener(handler);
mSwipeSharedState.applyActiveRecentsAnimationState(handler);
} else {
- AssistDataReceiver assistDataReceiver = !mTaskOverlayFactory.needAssist() ? null :
- new AssistDataReceiver() {
- @Override
- public void onHandleAssistData(Bundle bundle) {
- if (mInteractionHandler == null) {
- // Interaction is probably complete
- mRecentsModel.preloadAssistData(mRunningTask.id, bundle);
- } else if (handler == mInteractionHandler) {
- handler.onAssistDataReceived(bundle);
- }
- }
- };
-
RecentsAnimationListenerSet newListenerSet =
mSwipeSharedState.newRecentsAnimationListenerSet();
newListenerSet.addListener(handler);
BackgroundExecutor.get().submit(
() -> ActivityManagerWrapper.getInstance().startRecentsActivity(
- mHomeIntent, assistDataReceiver, newListenerSet,
- null, null));
+ mHomeIntent, null, newListenerSet, null, null));
}
}
diff --git a/quickstep/src/com/android/quickstep/RecentsModel.java b/quickstep/src/com/android/quickstep/RecentsModel.java
index 57694d5..f3e1545 100644
--- a/quickstep/src/com/android/quickstep/RecentsModel.java
+++ b/quickstep/src/com/android/quickstep/RecentsModel.java
@@ -54,14 +54,10 @@
public static final MainThreadInitializedObject<RecentsModel> INSTANCE =
new MainThreadInitializedObject<>(c -> new RecentsModel(c));
- private final SparseArray<Bundle> mCachedAssistData = new SparseArray<>(1);
- private final ArrayList<AssistDataListener> mAssistDataListeners = new ArrayList<>();
-
private final Context mContext;
private final MainThreadExecutor mMainThreadExecutor;
private ISystemUiProxy mSystemUiProxy;
- private boolean mClearAssistCacheOnStackChange = true;
private final RecentTasksList mTaskList;
private final TaskIconCache mIconCache;
@@ -172,16 +168,6 @@
});
}
- @Override
- public void onTaskStackChanged() {
- Preconditions.assertUIThread();
- if (mClearAssistCacheOnStackChange) {
- mCachedAssistData.clear();
- } else {
- mClearAssistCacheOnStackChange = true;
- }
- }
-
public void setSystemUiProxy(ISystemUiProxy systemUiProxy) {
mSystemUiProxy = systemUiProxy;
}
@@ -253,44 +239,4 @@
+ ": ", e);
}
}
-
- public void resetAssistCache() {
- mCachedAssistData.clear();
- }
-
- @WorkerThread
- public void preloadAssistData(int taskId, Bundle data) {
- mMainThreadExecutor.execute(() -> {
- mCachedAssistData.put(taskId, data);
- // We expect a stack change callback after the assist data is set. So ignore the
- // very next stack change callback.
- mClearAssistCacheOnStackChange = false;
-
- int count = mAssistDataListeners.size();
- for (int i = 0; i < count; i++) {
- mAssistDataListeners.get(i).onAssistDataReceived(taskId);
- }
- });
- }
-
- public Bundle getAssistData(int taskId) {
- Preconditions.assertUIThread();
- return mCachedAssistData.get(taskId);
- }
-
- public void addAssistDataListener(AssistDataListener listener) {
- mAssistDataListeners.add(listener);
- }
-
- public void removeAssistDataListener(AssistDataListener listener) {
- mAssistDataListeners.remove(listener);
- }
-
- /**
- * Callback for receiving assist data
- */
- public interface AssistDataListener {
-
- void onAssistDataReceived(int taskId);
- }
}
diff --git a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
index cc49d46..d979c99 100644
--- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
+++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java
@@ -31,8 +31,6 @@
import java.util.ArrayList;
import java.util.List;
-import androidx.annotation.AnyThread;
-
/**
* Factory class to create and add an overlays on the TaskView
*/
@@ -51,11 +49,6 @@
new MainThreadInitializedObject<>(c -> Overrides.getObject(TaskOverlayFactory.class,
c, R.string.task_overlay_factory_class));
- @AnyThread
- public boolean needAssist() {
- return false;
- }
-
public TaskOverlay createOverlay(View thumbnailView) {
return new TaskOverlay();
}
diff --git a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
index 1031577..8d90813 100644
--- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
+++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
@@ -53,7 +53,6 @@
import android.graphics.Rect;
import android.graphics.RectF;
import android.os.Build;
-import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
@@ -164,8 +163,6 @@
getFlagForIndex(16, "STATE_START_NEW_TASK");
private static final int STATE_CURRENT_TASK_FINISHED =
getFlagForIndex(17, "STATE_CURRENT_TASK_FINISHED");
- private static final int STATE_ASSIST_DATA_RECEIVED =
- getFlagForIndex(18, "STATE_ASSIST_DATA_RECEIVED");
private static final int LAUNCHER_UI_STATES =
STATE_LAUNCHER_PRESENT | STATE_LAUNCHER_DRAWN | STATE_ACTIVITY_MULTIPLIER_COMPLETE
@@ -264,8 +261,6 @@
private final long mTouchTimeMs;
private long mLauncherFrameDrawnTime;
- private Bundle mAssistData;
-
WindowTransformSwipeHandler(RunningTaskInfo runningTaskInfo, Context context,
long touchTimeMs, ActivityControlHelper<T> controller, boolean continuingLastGesture,
InputConsumerController inputConsumer) {
@@ -337,11 +332,6 @@
| STATE_CURRENT_TASK_FINISHED | STATE_GESTURE_COMPLETED
| STATE_GESTURE_STARTED,
this::setupLauncherUiAfterSwipeUpAnimation);
- mStateCallback.addCallback(STATE_LAUNCHER_PRESENT | STATE_APP_CONTROLLER_RECEIVED
- | STATE_ACTIVITY_MULTIPLIER_COMPLETE | STATE_SCALED_CONTROLLER_RECENTS
- | STATE_CURRENT_TASK_FINISHED | STATE_GESTURE_COMPLETED
- | STATE_GESTURE_STARTED | STATE_ASSIST_DATA_RECEIVED,
- this::preloadAssistData);
mStateCallback.addCallback(STATE_HANDLER_INVALIDATED, this::invalidateHandler);
mStateCallback.addCallback(STATE_LAUNCHER_PRESENT | STATE_HANDLER_INVALIDATED,
@@ -1208,15 +1198,6 @@
updateFinalShift();
}
- public void onAssistDataReceived(Bundle assistData) {
- mAssistData = assistData;
- setStateOnUiThread(STATE_ASSIST_DATA_RECEIVED);
- }
-
- private void preloadAssistData() {
- RecentsModel.INSTANCE.get(mContext).preloadAssistData(mRunningTaskId, mAssistData);
- }
-
public static float getHiddenTargetAlpha(RemoteAnimationTargetCompat app, Float expectedAlpha) {
if (!(app.isNotInRecents
|| app.activityType == RemoteAnimationTargetCompat.ACTIVITY_TYPE_HOME)) {