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

Commit b69802c5 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9080545 from 3ad08cd2 to tm-qpr1-release 

Change-Id: I395dc00671c1c65a6ce0ee696ff4a3f725bffb73
parents 304dd1ab 3ad08cd2

quickstep/src/com/android/launcher3/model/PredictionUpdateTask.java

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ import android.content.pm.LauncherApps; 
import android.content.pm.ShortcutInfo;

import android.os.UserHandle;



import androidx.annotation.NonNull;



import com.android.launcher3.LauncherAppState;

import com.android.launcher3.Utilities;

import com.android.launcher3.model.BgDataModel.FixedContainerItems;
@@ -52,7 +54,8 @@ public class PredictionUpdateTask extends BaseModelUpdateTask { 
    }



    @Override

    public void execute(LauncherAppState app, BgDataModel dataModel, AllAppsList apps) {

    public void execute(@NonNull final LauncherAppState app, @NonNull final BgDataModel dataModel,

            @NonNull final AllAppsList apps) {

        Context context = app.getContext();



        // TODO: remove this

quickstep/src/com/android/launcher3/model/WidgetsPredictionUpdateTask.java

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.app.prediction.AppTarget; 
import android.content.ComponentName;

import android.text.TextUtils;



import androidx.annotation.NonNull;



import com.android.launcher3.LauncherAppState;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.model.BgDataModel.FixedContainerItems;
@@ -52,7 +54,8 @@ public final class WidgetsPredictionUpdateTask extends BaseModelUpdateTask { 
     * workspace.

     */

    @Override

    public void execute(LauncherAppState appState, BgDataModel dataModel, AllAppsList apps) {

    public void execute(@NonNull final LauncherAppState appState,

            @NonNull final BgDataModel dataModel, @NonNull final AllAppsList apps) {

        Set<ComponentKey> widgetsInWorkspace = dataModel.appWidgets.stream().map(

                widget -> new ComponentKey(widget.providerName, widget.user)).collect(

                Collectors.toSet());

quickstep/src/com/android/launcher3/uioverrides/BaseRecentsViewStateController.java

+5 −0
Original line number Diff line number Diff line
@@ -88,6 +88,11 @@ public abstract class BaseRecentsViewStateController<T extends RecentsView> 
            return;

        }

        setStateWithAnimationInternal(toState, config, builder);

        builder.addEndListener(success -> {

            if (!success) {

                mRecentsView.reset();

            }

        });

    }



    /**

quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java

+5 −0
Original line number Diff line number Diff line
@@ -78,6 +78,11 @@ public class FallbackRecentsStateController implements StateHandler<RecentsState 
        }

        // While animating into recents, update the visible task data as needed

        setter.addOnFrameCallback(() -> mRecentsView.loadVisibleTaskData(FLAG_UPDATE_ALL));

        setter.addEndListener(success -> {

            if (!success) {

                mRecentsView.reset();

            }

        });

        mRecentsView.updateEmptyMessage();



        setProperties(toState, config, setter);

quickstep/src/com/android/quickstep/fallback/FallbackRecentsView.java

+0 −5
Original line number Diff line number Diff line
@@ -231,11 +231,6 @@ public class FallbackRecentsView extends RecentsView<RecentsActivity, RecentsSta 
        setFreezeViewVisibility(true);

    }



    @Override

    public void onStateTransitionFailed(RecentsState toState) {

        reset();

    }



    @Override

    public void onStateTransitionComplete(RecentsState finalState) {

        if (finalState == HOME) {