Update Launcher2 for LauncherApps Api review changes.

Bug: 17008230
Change-Id: I862b174a9da46fa46e53a6b51edae36dd62050f8

src/com/android/launcher2/Launcher.java

@@ -2115,7 +2115,7 @@ public final class Launcher extends Activity
     void startApplicationDetailsActivity(ComponentName componentName, UserHandle user) {
         LauncherApps launcherApps = (LauncherApps) getSystemService(Context.LAUNCHER_APPS_SERVICE);
         try {
-            launcherApps.showAppDetailsForProfile(componentName, user, null, null);
+            launcherApps.startAppDetailsActivity(componentName, user, null, null);
         } catch (SecurityException e) {
             Toast.makeText(this, R.string.activity_not_found, Toast.LENGTH_SHORT).show();
             Log.e(TAG, "Launcher does not have permission to launch settings");
@@ -2163,7 +2163,7 @@ public final class Launcher extends Activity
                     // Could be launching some bookkeeping activity
                     startActivity(intent, opts.toBundle());
                 } else {
-                    launcherApps.startActivityForProfile(intent.getComponent(), user,
+                    launcherApps.startMainActivity(intent.getComponent(), user,
                             intent.getSourceBounds(),
                             opts.toBundle());
                 }
@@ -2171,7 +2171,7 @@ public final class Launcher extends Activity
                 if (user == null || user.equals(android.os.Process.myUserHandle())) {
                     startActivity(intent);
                 } else {
-                    launcherApps.startActivityForProfile(intent.getComponent(), user,
+                    launcherApps.startMainActivity(intent.getComponent(), user,
                             intent.getSourceBounds(), null);
                 }
             }

src/com/android/launcher2/LauncherApplication.java

@@ -56,7 +56,7 @@ public class LauncherApplication extends Application {
         mModel = new LauncherModel(this, mIconCache);
         LauncherApps launcherApps = (LauncherApps)
                 getSystemService(Context.LAUNCHER_APPS_SERVICE);
-        launcherApps.addOnAppsChangedCallback(mModel.getLauncherAppsCallback());
+        launcherApps.addCallback(mModel.getLauncherAppsCallback());
 
         // Register intent receivers
         IntentFilter filter = new IntentFilter();

src/com/android/launcher2/LauncherModel.java

@@ -152,7 +152,7 @@ public class LauncherModel extends BroadcastReceiver {
 
     private final LauncherApps mLauncherApps;
     final UserManager mUserManager;
-    private final LauncherApps.OnAppsChangedCallback mLauncherAppsCallback;
+    private final LauncherApps.Callback mLauncherAppsCallback;
 
     public interface Callbacks {
         public boolean setLoadOnResume();
@@ -792,11 +792,11 @@ public class LauncherModel extends BroadcastReceiver {
         }
     }
 
-    public LauncherApps.OnAppsChangedCallback getLauncherAppsCallback() {
+    public LauncherApps.Callback getLauncherAppsCallback() {
         return mLauncherAppsCallback;
     }
 
-    private class LauncherAppsCallback extends LauncherApps.OnAppsChangedCallback {
+    private class LauncherAppsCallback extends LauncherApps.Callback {
         @Override
         public void onPackageChanged(String packageName, UserHandle user) {
             enqueuePackageUpdated(new PackageUpdatedTask(