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

Commit 571e5116 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Quick patch for PredictionUiStateManager.applyState interrupting... 

Merge "Quick patch for PredictionUiStateManager.applyState interrupting allapps" into ub-launcher3-qt-dev
parents 1b9afd4f 0c1ed7cb

quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java

+3 −0
Original line number Diff line number Diff line
@@ -197,7 +197,10 @@ public class PredictionUiStateManager implements OnGlobalLayoutListener, ItemInf 
        }

    }



    public boolean mDebugHadStateUpdate;



    private void updatePredictionStateAfterCallback() {

        mDebugHadStateUpdate = true;

        boolean validResults = false;

        for (List l : mPredictionServicePredictions) {

            validResults |= l != null && !l.isEmpty();

quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,9 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { 
        AppLaunchTracker.INSTANCE.initializeForTesting(new AppLaunchTracker());



        PredictionUiStateManager.INSTANCE.initializeForTesting(null);

        waitForLauncherCondition("Prediction never had state update",

                launcher -> PredictionUiStateManager.INSTANCE.get(

                        mTargetContext).mDebugHadStateUpdate);



        mCallback = PredictionUiStateManager.INSTANCE.get(mTargetContext).appPredictorCallback(

                Client.HOME);

src/com/android/launcher3/Launcher.java

+4 −0
Original line number Diff line number Diff line
@@ -2553,4 +2553,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 


        void onLauncherResume();

    }



    public boolean debugIsPredictionInitialized() {

        return true;

    }

}

tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ public class TaplTestsLauncher3 extends AbstractLauncherUiTest { 
            test.mDevice.pressHome();

        }

        test.waitForLauncherCondition("Launcher didn't start", launcher -> launcher != null);

        test.waitForLauncherCondition("Prediction never had state update",

                launcher -> launcher.debugIsPredictionInitialized());

        test.waitForState("Launcher internal state didn't switch to Home", LauncherState.NORMAL);

        test.waitForResumed("Launcher internal state is still Background");

        // Check that we switched to home.