Merge "Fixing overview scrim not initialized properly when launcher starts" into ub-launcher3-qt-dev
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
index 4a486f8..cb5cbdd 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionRowView.java
@@ -164,13 +164,6 @@
mParent = parent;
}
- private void setPredictionsEnabled(boolean predictionsEnabled) {
- if (predictionsEnabled != mPredictionsEnabled) {
- mPredictionsEnabled = predictionsEnabled;
- updateVisibility();
- }
- }
-
private void updateVisibility() {
setVisibility(mPredictionsEnabled ? VISIBLE : GONE);
}
@@ -220,8 +213,7 @@
* If the number of predicted apps is the same as the previous list of predicted apps,
* we can optimize by swapping them in place.
*/
- public void setPredictedApps(boolean predictionsEnabled, List<ComponentKeyMapper> apps) {
- setPredictionsEnabled(predictionsEnabled);
+ public void setPredictedApps(List<ComponentKeyMapper> apps) {
mPredictedAppComponents.clear();
mPredictedAppComponents.addAll(apps);
@@ -237,11 +229,6 @@
}
private void applyPredictionApps() {
- if (!mPredictionsEnabled) {
- mParent.onHeightUpdated();
- return;
- }
-
if (getChildCount() != mNumPredictedAppsPerRow) {
while (getChildCount() > mNumPredictedAppsPerRow) {
removeViewAt(0);
@@ -282,8 +269,11 @@
}
}
- if (predictionCount == 0) {
- setPredictionsEnabled(false);
+ boolean predictionsEnabled = predictionCount > 0;
+ if (predictionsEnabled != mPredictionsEnabled) {
+ mPredictionsEnabled = predictionsEnabled;
+ mLauncher.reapplyUi();
+ updateVisibility();
}
mParent.onHeightUpdated();
}
diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
index 64cb4b4..085bbc4 100644
--- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
+++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionUiStateManager.java
@@ -177,16 +177,10 @@
}
private void applyState(PredictionState state) {
- boolean wasEnabled = mCurrentState.isEnabled;
mCurrentState = state;
if (mAppsView != null) {
mAppsView.getFloatingHeaderView().findFixedRowByType(PredictionRowView.class)
- .setPredictedApps(mCurrentState.isEnabled, mCurrentState.apps);
-
- if (wasEnabled != mCurrentState.isEnabled) {
- // Reapply state as the State UI might have changed.
- Launcher.getLauncher(mAppsView.getContext()).getStateManager().reapplyState(true);
- }
+ .setPredictedApps(mCurrentState.apps);
}
}