aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-19 18:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Quick patch for PredictionUiStateManager.applyState interrupting allapps" into ub-launcher3-qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-23 20:53:27 +00:00
committed by Android (Google) Code Review
parent 1b9afd4f73 0c1ed7cb4c
commit 571e51161c
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
View File

@@ -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();

3
quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java
View File

@@ -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);

4
src/com/android/launcher3/Launcher.java
View File

@@ -2553,4 +2553,8 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,
void onLauncherResume();
}
public boolean debugIsPredictionInitialized() {
return true;
}
}

2
tests/src/com/android/launcher3/ui/TaplTestsLauncher3.java
View File

@@ -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.