diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewActionsFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewActionsFactory.java deleted file mode 100644 index 6d17b27ab5..0000000000 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/OverviewActionsFactory.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2019 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.quickstep; - -import static com.android.launcher3.util.MainThreadInitializedObject.forOverride; - -import android.view.View; - -import com.android.launcher3.R; -import com.android.launcher3.util.MainThreadInitializedObject; -import com.android.launcher3.util.ResourceBasedOverride; - -/** - * Overview actions are shown in overview underneath the task snapshot. This factory class is - * overrideable in an overlay. The {@link OverviewActions} class provides the view that should be - * shown in the Overview. - */ -public class OverviewActionsFactory implements ResourceBasedOverride { - - public static final MainThreadInitializedObject INSTANCE = - forOverride(OverviewActionsFactory.class, R.string.overview_actions_factory_class); - - /** Create a new Overview Actions for interacting between the actions and overview. */ - public OverviewActions createOverviewActions() { - return new OverviewActions(); - } - - /** Overlay overrideable, base class does nothing. */ - public static class OverviewActions { - /** Get the view to show in the overview. */ - public View getView() { - return null; - } - } -} diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java index b5441dfd14..ec7cddfe07 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/TaskOverlayFactory.java @@ -19,6 +19,9 @@ package com.android.quickstep; import static com.android.launcher3.util.MainThreadInitializedObject.forOverride; import android.graphics.Matrix; +import android.view.View; + +import androidx.annotation.Nullable; import com.android.launcher3.BaseActivity; import com.android.launcher3.BaseDraggingActivity; @@ -75,6 +78,11 @@ public class TaskOverlayFactory implements ResourceBasedOverride { */ public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix) { } + @Nullable + public View getActionsView() { + return null; + } + /** * Called when the overlay is no longer used. */ diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java index 4e0fdea485..3bc1509d46 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/TaskThumbnailView.java @@ -197,6 +197,10 @@ public class TaskThumbnailView extends View implements PluginListener - -