Merge "Fix incorrect launcher loading." into sc-dev (26801f80) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/model/LoaderTask.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -588,12 +588,17 @@ public class LoaderTask implements Runnable {
		if (isSafeMode && !isSystemApp(context, intent)) {
		info.runtimeStatusFlags \|= FLAG_DISABLED_SAFEMODE;
		}
		LauncherActivityInfo activityInfo = c.getLauncherActivityInfo();
		if (activityInfo != null) {
		info.setProgressLevel(
		PackageManagerHelper
		.getLoadingProgress(activityInfo),
		PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
		}

		if (c.restoreFlag != 0 && !TextUtils.isEmpty(targetPkg)) {
		tempPackageKey.update(targetPkg, c.user);
		SessionInfo si = installingPkgs.get(tempPackageKey);
		LauncherActivityInfo activityInfo =
		c.getLauncherActivityInfo();
		if (si == null) {
		info.runtimeStatusFlags &=
		~ItemInfoWithIcon.FLAG_INSTALL_SESSION_ACTIVE;
		@@ -603,12 +608,6 @@ public class LoaderTask implements Runnable {
		info.setProgressLevel(
		installProgress,
		PackageInstallInfo.STATUS_INSTALLING);
		} else {
		info.setProgressLevel(
		PackageManagerHelper
		.getLoadingProgress(activityInfo),
		PackageInstallInfo
		.STATUS_INSTALLED_DOWNLOADING);
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -179,7 +179,7 @@ public class AppInfo extends ItemInfoWithIcon {
		// Sets the progress level, installation and incremental download flags.
		info.setProgressLevel(
		PackageManagerHelper.getLoadingProgress(lai),
		PackageInstallInfo.STATUS_INSTALLED);
		PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING);
		}

		@Override