From 652c0bb1908eb7ef41a957d7f0de6cf844b55bdd Mon Sep 17 00:00:00 2001 From: Songchun Fan Date: Thu, 29 Oct 2020 13:14:25 -0700 Subject: [PATCH] [pm/incremental] address API review comments for LauncherApps APIs + change "*Progress*" to "*LoadingProgress*". + removed "LauncherActivityInfo.isLoading()" because it can be derived from "LauncherActivityInfo.getLoadingProgress()". BUG: 171804873 Test: atest LauncherAppsSingleUserTest Change-Id: I001e8d946a13bcf43c03081e730ac07a1c3cf4bc --- api/current.txt | 5 ++--- core/api/current.txt | 5 ++--- .../android/content/pm/IOnAppsChangedListener.aidl | 2 +- .../android/content/pm/LauncherActivityInfo.java | 11 ++--------- core/java/android/content/pm/LauncherApps.java | 13 ++++++------- .../com/android/server/pm/LauncherAppsService.java | 2 +- 6 files changed, 14 insertions(+), 24 deletions(-) diff --git a/api/current.txt b/api/current.txt index 9ff7cc255bf4b..466266b452a9c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -11718,10 +11718,9 @@ package android.content.pm { method public long getFirstInstallTime(); method public android.graphics.drawable.Drawable getIcon(int); method public CharSequence getLabel(); + method public float getLoadingProgress(); method public String getName(); - method public float getProgress(); method public android.os.UserHandle getUser(); - method public boolean isLoading(); method public boolean isStartable(); } @@ -11762,7 +11761,7 @@ package android.content.pm { ctor public LauncherApps.Callback(); method public abstract void onPackageAdded(String, android.os.UserHandle); method public abstract void onPackageChanged(String, android.os.UserHandle); - method public void onPackageProgressChanged(@NonNull String, @NonNull android.os.UserHandle, float); + method public void onPackageLoadingProgressChanged(@NonNull String, @NonNull android.os.UserHandle, float); method public abstract void onPackageRemoved(String, android.os.UserHandle); method public abstract void onPackagesAvailable(String[], android.os.UserHandle, boolean); method public void onPackagesSuspended(String[], android.os.UserHandle); diff --git a/core/api/current.txt b/core/api/current.txt index 16a5f5e82f211..05b57af1dccd6 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -11718,10 +11718,9 @@ package android.content.pm { method public long getFirstInstallTime(); method public android.graphics.drawable.Drawable getIcon(int); method public CharSequence getLabel(); + method public float getLoadingProgress(); method public String getName(); - method public float getProgress(); method public android.os.UserHandle getUser(); - method public boolean isLoading(); method public boolean isStartable(); } @@ -11762,7 +11761,7 @@ package android.content.pm { ctor public LauncherApps.Callback(); method public abstract void onPackageAdded(String, android.os.UserHandle); method public abstract void onPackageChanged(String, android.os.UserHandle); - method public void onPackageProgressChanged(@NonNull String, @NonNull android.os.UserHandle, float); + method public void onPackageLoadingProgressChanged(@NonNull String, @NonNull android.os.UserHandle, float); method public abstract void onPackageRemoved(String, android.os.UserHandle); method public abstract void onPackagesAvailable(String[], android.os.UserHandle, boolean); method public void onPackagesSuspended(String[], android.os.UserHandle); diff --git a/core/java/android/content/pm/IOnAppsChangedListener.aidl b/core/java/android/content/pm/IOnAppsChangedListener.aidl index f24ed80983f8d..830cbe0e0dd00 100644 --- a/core/java/android/content/pm/IOnAppsChangedListener.aidl +++ b/core/java/android/content/pm/IOnAppsChangedListener.aidl @@ -33,5 +33,5 @@ oneway interface IOnAppsChangedListener { in Bundle launcherExtras); void onPackagesUnsuspended(in UserHandle user, in String[] packageNames); void onShortcutChanged(in UserHandle user, String packageName, in ParceledListSlice shortcuts); - void onPackageProgressChanged(in UserHandle user, String packageName, float progress); + void onPackageLoadingProgressChanged(in UserHandle user, String packageName, float progress); } diff --git a/core/java/android/content/pm/LauncherActivityInfo.java b/core/java/android/content/pm/LauncherActivityInfo.java index ead80d0225429..fd96e85db3deb 100644 --- a/core/java/android/content/pm/LauncherActivityInfo.java +++ b/core/java/android/content/pm/LauncherActivityInfo.java @@ -91,16 +91,9 @@ public class LauncherActivityInfo { } /** - * @return whether the package is still loading. + * @return Package loading progress, range between [0, 1]. */ - public boolean isLoading() { - return mInternal.getIncrementalStatesInfo().isLoading(); - } - - /** - * @return Package loading progress - */ - public float getProgress() { + public float getLoadingProgress() { return mInternal.getIncrementalStatesInfo().getProgress(); } diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java index 2909d66d72ff8..c964b4b9bb53b 100644 --- a/core/java/android/content/pm/LauncherApps.java +++ b/core/java/android/content/pm/LauncherApps.java @@ -17,7 +17,6 @@ package android.content.pm; import static android.Manifest.permission; -import static android.app.PendingIntent.FLAG_IMMUTABLE; import android.annotation.CallbackExecutor; import android.annotation.IntDef; @@ -333,7 +332,7 @@ public class LauncherApps { * @param user The UserHandle of the profile that generated the change. * @param progress The new progress value, between [0, 1]. */ - public void onPackageProgressChanged(@NonNull String packageName, + public void onPackageLoadingProgressChanged(@NonNull String packageName, @NonNull UserHandle user, float progress) {} } @@ -1702,15 +1701,15 @@ public class LauncherApps { } } - public void onPackageProgressChanged(UserHandle user, String packageName, + public void onPackageLoadingProgressChanged(UserHandle user, String packageName, float progress) { if (DEBUG) { - Log.d(TAG, "onPackageProgressChanged " + user.getIdentifier() + "," + Log.d(TAG, "onPackageLoadingProgressChanged " + user.getIdentifier() + "," + packageName + "," + progress); } synchronized (LauncherApps.this) { for (CallbackMessageHandler callback : mCallbacks) { - callback.postOnPackageProgressChanged(user, packageName, progress); + callback.postOnPackageLoadingProgressChanged(user, packageName, progress); } } } @@ -1777,7 +1776,7 @@ public class LauncherApps { mCallback.onShortcutsChanged(info.packageName, info.shortcuts, info.user); break; case MSG_LOADING_PROGRESS_CHANGED: - mCallback.onPackageProgressChanged(info.packageName, info.user, + mCallback.onPackageLoadingProgressChanged(info.packageName, info.user, info.mLoadingProgress); break; } @@ -1847,7 +1846,7 @@ public class LauncherApps { obtainMessage(MSG_SHORTCUT_CHANGED, info).sendToTarget(); } - public void postOnPackageProgressChanged(UserHandle user, String packageName, + public void postOnPackageLoadingProgressChanged(UserHandle user, String packageName, float progress) { CallbackInfo info = new CallbackInfo(); info.packageName = packageName; diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index b679c0fbab836..dd338655732b2 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -1563,7 +1563,7 @@ public class LauncherAppsService extends SystemService { continue; } try { - listener.onPackageProgressChanged(mUser, mPackageName, progress); + listener.onPackageLoadingProgressChanged(mUser, mPackageName, progress); } catch (RemoteException re) { Slog.d(TAG, "Callback failed ", re); }