Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ec1bc48 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated initOverlay interface used by TaskOverlayFactoryGo" into main

parents f7ca8d60 ac65a997

go/quickstep/src/com/android/quickstep/TaskOverlayFactoryGo.java

+3 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.content.SharedPreferences;

import android.graphics.Bitmap;

import android.graphics.Color;

import android.graphics.Matrix;

import android.graphics.drawable.ColorDrawable;
@@ -47,6 +48,7 @@ import android.widget.Button; 
import android.widget.TextView;



import androidx.annotation.IntDef;

import androidx.annotation.Nullable;

import androidx.annotation.VisibleForTesting;



import com.android.launcher3.BaseActivity;
@@ -58,7 +60,6 @@ import com.android.quickstep.util.RecentsOrientedState; 
import com.android.quickstep.views.GoOverviewActionsView;

import com.android.quickstep.views.TaskContainer;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.recents.model.ThumbnailData;



import java.lang.annotation.Retention;
@@ -131,7 +132,7 @@ public final class TaskOverlayFactoryGo extends TaskOverlayFactory { 
         * Called when the current task is interactive for the user

         */

        @Override

        public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,

        public void initOverlay(Task task, @Nullable Bitmap thumbnail, Matrix matrix,

                boolean rotated) {

            if (mDialog != null && mDialog.isShowing()) {

                // Redraw the dialog in case the layout changed

quickstep/src/com/android/quickstep/TaskOverlayFactory.java

+0 −12
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ import com.android.quickstep.views.RecentsViewContainer; 
import com.android.quickstep.views.TaskContainer;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.recents.model.ThumbnailData;



import java.util.ArrayList;

import java.util.List;
@@ -185,17 +184,6 @@ public class TaskOverlayFactory implements ResourceBasedOverride { 
            return mTaskContainer.getTaskView();

        }



        /**

         * Called when the current task is interactive for the user

         *

         * @deprecated TODO(b/350931107): Remove this interface once TaskOverlayFactoryGo is updated

         */

        @Deprecated

        public void initOverlay(Task task, ThumbnailData thumbnail, Matrix matrix,

                boolean rotated) {

            initOverlay(task, thumbnail.getThumbnail(), matrix, rotated);

        }



        /**

         * Called when the current task is interactive for the user

         */