Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 652c0bb1 authored by Songchun Fan's avatar Songchun Fan
Browse files

[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
parent 6e59ac63

api/current.txt

+2 −3
Original line number Diff line number Diff line
@@ -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);

























core/api/current.txt



+2
−3






























Original line number
Diff line number
Diff line








@@ -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);

























core/java/android/content/pm/IOnAppsChangedListener.aidl



+1
−1






























Original line number
Diff line number
Diff line








@@ -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);















}
























core/java/android/content/pm/LauncherActivityInfo.java



+2
−9






























Original line number
Diff line number
Diff line








@@ -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();















    }

















































core/java/android/content/pm/LauncherApps.java



+6
−7






























Original line number
Diff line number
Diff line








@@ -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;