Merge "Use new not-deprecated builder constructors for AppTarget" into ub-launcher3-qt-dev

This commit is contained in:
TreeHugger Robot
2019-05-11 00:24:15 +00:00
committed by Android (Google) Code Review
2 changed files with 12 additions and 12 deletions
@@ -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);
}
}
@@ -149,10 +149,10 @@ public class AppPredictionsUITests extends AbstractQuickStepTest {
List<AppTarget> 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);