From 426d3650ae0c0b1439fc8ecfcaa090c60058ad7b Mon Sep 17 00:00:00 2001 From: George Hodulik Date: Fri, 10 May 2019 16:44:31 -0700 Subject: [PATCH] Use new not-deprecated builder constructors for AppTarget Bug: 132458790 Test: Builds now Change-Id: I20109d868d2ddd4434bc7b2e812219ec853161d8 --- .../appprediction/PredictionAppTracker.java | 16 ++++++++-------- .../android/quickstep/AppPredictionsUITests.java | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java index 0b8c1c57f9..fa2810630c 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/appprediction/PredictionAppTracker.java @@ -158,10 +158,10 @@ public class PredictionAppTracker extends AppLaunchTracker { public void onStartShortcut(String packageName, String shortcutId, UserHandle user, String container) { // TODO: Use the full shortcut info - AppTarget target = new AppTarget.Builder(new AppTargetId("shortcut:" + shortcutId)) - .setTarget(packageName, user) - .setClassName(shortcutId) - .build(); + AppTarget target = new AppTarget + .Builder(new AppTargetId("shortcut:" + shortcutId), packageName, user) + .setClassName(shortcutId) + .build(); sendLaunch(target, container); } @@ -169,10 +169,10 @@ public class PredictionAppTracker extends AppLaunchTracker { @UiThread public void onStartApp(ComponentName cn, UserHandle user, String container) { if (cn != null) { - AppTarget target = new AppTarget.Builder(new AppTargetId("app:" + cn)) - .setTarget(cn.getPackageName(), user) - .setClassName(cn.getClassName()) - .build(); + AppTarget target = new AppTarget + .Builder(new AppTargetId("app:" + cn), cn.getPackageName(), user) + .setClassName(cn.getClassName()) + .build(); sendLaunch(target, container); } } diff --git a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java index ffe3633353..47ce44c676 100644 --- a/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java +++ b/quickstep/tests/src/com/android/quickstep/AppPredictionsUITests.java @@ -149,10 +149,10 @@ public class AppPredictionsUITests extends AbstractQuickStepTest { List targets = new ArrayList<>(activities.length); for (LauncherActivityInfo info : activities) { ComponentName cn = info.getComponentName(); - AppTarget target = new AppTarget.Builder(new AppTargetId("app:" + cn)) - .setTarget(cn.getPackageName(), info.getUser()) - .setClassName(cn.getClassName()) - .build(); + AppTarget target = + new AppTarget.Builder(new AppTargetId("app:" + cn), cn.getPackageName(), info.getUser()) + .setClassName(cn.getClassName()) + .build(); targets.add(target); } mCallback.onTargetsAvailable(targets);