Merge "TaskOverlayFactoryGo: Keep persistent instance of AssistContentRequester" into sc-dev am: b7cecf8a90

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14803962

Change-Id: Idf82c8d5d5d7ffb646fbaeb0403bf9ac42c7b1ce
This commit is contained in:
Jon Spivack
2021-06-03 02:33:16 +00:00
committed by Automerger Merge Worker
@@ -53,14 +53,17 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
public static final int ERROR_PERMISSIONS = 1; public static final int ERROR_PERMISSIONS = 1;
private static final String TAG = "TaskOverlayFactoryGo"; private static final String TAG = "TaskOverlayFactoryGo";
// Empty constructor required for ResourceBasedOverride private AssistContentRequester mContentRequester;
public TaskOverlayFactoryGo(Context context) {}
public TaskOverlayFactoryGo(Context context) {
mContentRequester = new AssistContentRequester(context);
}
/** /**
* Create a new overlay instance for the given View * Create a new overlay instance for the given View
*/ */
public TaskOverlayGo createOverlay(TaskThumbnailView thumbnailView) { public TaskOverlayGo createOverlay(TaskThumbnailView thumbnailView) {
return new TaskOverlayGo(thumbnailView); return new TaskOverlayGo(thumbnailView, mContentRequester);
} }
/** /**
@@ -72,9 +75,12 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
private String mTaskPackageName; private String mTaskPackageName;
private String mWebUrl; private String mWebUrl;
private boolean mAssistPermissionsEnabled; private boolean mAssistPermissionsEnabled;
private AssistContentRequester mFactoryContentRequester;
private TaskOverlayGo(TaskThumbnailView taskThumbnailView) { private TaskOverlayGo(TaskThumbnailView taskThumbnailView,
AssistContentRequester assistContentRequester) {
super(taskThumbnailView); super(taskThumbnailView);
mFactoryContentRequester = assistContentRequester;
} }
/** /**
@@ -105,9 +111,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory {
} }
int taskId = task.key.id; int taskId = task.key.id;
AssistContentRequester contentRequester = mFactoryContentRequester.requestAssistContent(taskId, this::onAssistContentReceived);
new AssistContentRequester(mApplicationContext);
contentRequester.requestAssistContent(taskId, this::onAssistContentReceived);
} }
/** Provide Assist Content to the overlay. */ /** Provide Assist Content to the overlay. */