diff --git a/proguard.flags b/proguard.flags index ae91f1ff4c..9a33a09263 100644 --- a/proguard.flags +++ b/proguard.flags @@ -107,3 +107,7 @@ -keep class com.android.launcher3.tracing.LauncherTraceProto$* { *; } -keep class com.android.launcher3.userevent.LauncherLogExtensions$* { *; } -keepattributes InnerClasses + +-keep class app.lawnchair.compatlib.** { + *; +} diff --git a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java index 5400ee1669..44bac1e8f2 100644 --- a/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java +++ b/quickstep/src/com/android/launcher3/model/QuickstepModelDelegate.java @@ -42,6 +42,8 @@ import android.content.pm.ShortcutInfo; import android.os.UserHandle; import android.util.Log; +import androidx.annotation.Keep; +import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; @@ -230,7 +232,13 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange private void registerPredictor(PredictorState state, AppPredictor predictor) { state.predictor = predictor; state.predictor.registerPredictionUpdates( - Executors.MODEL_EXECUTOR, t -> handleUpdate(state, t)); + Executors.MODEL_EXECUTOR, new AppPredictor.Callback() { + @Keep + @Override + public void onTargetsAvailable(@NonNull List targets) { + handleUpdate(state, targets); + } + }); state.predictor.requestPredictionUpdate(); } @@ -245,13 +253,17 @@ public class QuickstepModelDelegate extends ModelDelegate implements OnIDPChange private void registerWidgetsPredictor(AppPredictor predictor) { mWidgetsRecommendationState.predictor = predictor; mWidgetsRecommendationState.predictor.registerPredictionUpdates( - Executors.MODEL_EXECUTOR, targets -> { - if (mWidgetsRecommendationState.setTargets(targets)) { - // No diff, skip - return; + Executors.MODEL_EXECUTOR, new AppPredictor.Callback() { + @Keep + @Override + public void onTargetsAvailable(@NonNull List targets) { + if (mWidgetsRecommendationState.setTargets(targets)) { + // No diff, skip + return; + } + mApp.getModel().enqueueModelUpdateTask( + new WidgetsPredictionUpdateTask(mWidgetsRecommendationState, targets)); } - mApp.getModel().enqueueModelUpdateTask( - new WidgetsPredictionUpdateTask(mWidgetsRecommendationState, targets)); }); mWidgetsRecommendationState.predictor.requestPredictionUpdate(); }