From 74e4fea394098ca5ceee2611f9a0541914a4730c Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Tue, 19 Feb 2019 13:15:06 -0800 Subject: [PATCH] Removing support for capturing assist structure on swipe up Change-Id: I381b4d1254cd9ced30b5d2a873dbe0736b2924ee --- .../launcher3/uioverrides/OverviewState.java | 1 - .../quickstep/OtherActivityTouchConsumer.java | 16 +----- .../com/android/quickstep/RecentsModel.java | 54 ------------------- .../android/quickstep/TaskOverlayFactory.java | 7 --- .../WindowTransformSwipeHandler.java | 21 +------- 5 files changed, 2 insertions(+), 97 deletions(-) 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 4eda45477b..3602508a5e 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 class OverviewState extends LauncherState { 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 d8c45c5066..30b0c0279f 100644 --- a/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java +++ b/quickstep/src/com/android/quickstep/OtherActivityTouchConsumer.java @@ -298,26 +298,12 @@ public class OtherActivityTouchConsumer extends ContextWrapper implements TouchC 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 e61c00af7a..02deef1272 100644 --- a/quickstep/src/com/android/quickstep/RecentsModel.java +++ b/quickstep/src/com/android/quickstep/RecentsModel.java @@ -52,14 +52,10 @@ public class RecentsModel extends TaskStackChangeListener { public static final MainThreadInitializedObject INSTANCE = new MainThreadInitializedObject<>(c -> new RecentsModel(c)); - private final SparseArray mCachedAssistData = new SparseArray<>(1); - private final ArrayList 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; @@ -162,16 +158,6 @@ public class RecentsModel extends TaskStackChangeListener { }); } - @Override - public void onTaskStackChanged() { - Preconditions.assertUIThread(); - if (mClearAssistCacheOnStackChange) { - mCachedAssistData.clear(); - } else { - mClearAssistCacheOnStackChange = true; - } - } - public void setSystemUiProxy(ISystemUiProxy systemUiProxy) { mSystemUiProxy = systemUiProxy; } @@ -243,44 +229,4 @@ public class RecentsModel extends TaskStackChangeListener { + ": ", 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 cc49d46e09..d979c991a2 100644 --- a/quickstep/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/src/com/android/quickstep/TaskOverlayFactory.java @@ -31,8 +31,6 @@ import com.android.systemui.shared.recents.model.ThumbnailData; 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 @@ public class TaskOverlayFactory implements ResourceBasedOverride { 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 67dcc78ca8..84d70d9d7b 100644 --- a/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java +++ b/quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java @@ -53,7 +53,6 @@ import android.graphics.Point; 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; @@ -115,7 +114,7 @@ public class WindowTransformSwipeHandler implements SwipeAnimationListener, OnApplyWindowInsetsListener { private static final String TAG = WindowTransformSwipeHandler.class.getSimpleName(); - private static final String[] STATE_NAMES = DEBUG_STATES ? new String[20] : null; + private static final String[] STATE_NAMES = DEBUG_STATES ? new String[19] : null; private static int getFlagForIndex(int index, String name) { if (DEBUG_STATES) { @@ -165,8 +164,6 @@ public class WindowTransformSwipeHandler 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 @@ -261,8 +258,6 @@ public class WindowTransformSwipeHandler private final long mTouchTimeMs; private long mLauncherFrameDrawnTime; - private Bundle mAssistData; - WindowTransformSwipeHandler(RunningTaskInfo runningTaskInfo, Context context, long touchTimeMs, ActivityControlHelper controller, boolean continuingLastGesture, InputConsumerController inputConsumer) { @@ -334,11 +329,6 @@ public class WindowTransformSwipeHandler | 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, @@ -1197,15 +1187,6 @@ public class WindowTransformSwipeHandler 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)) {