Merge "Removing support for capturing assist structure on swipe up" into ub-launcher3-master

This commit is contained in:
TreeHugger Robot authored and Android (Google) Code Review committed 2019-02-20 00:15:48 +00:00
commit 7b4215d633
5 files changed
+1 -96

No files matched your search

@@ -54,14 +54,10 @@ public class RecentsModel extends TaskStackChangeListener {
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 @@ 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;
}
@@ -253,44 +239,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);
}
}