Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Renaming of LauncherApps apis" into lmp-dev

Browse Source
This commit is contained in:
Kenny Guy
2014-09-08 20:43:22 +00:00
committed by Android (Google) Code Review
parent 897b01b39e 10a574fbf3
commit d9037a48c6
2 changed files with 20 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
api/current.txt
View File

@@ -8617,21 +8617,16 @@ package android.content.pm {
public class LauncherApps {
method public void addCallback(android.content.pm.LauncherApps.Callback);
method public void addCallback(android.content.pm.LauncherApps.Callback, android.os.Handler);
method public void addOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback);
method public void addOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback, android.os.Handler);
method public java.util.List<android.content.pm.LauncherActivityInfo> getActivityList(java.lang.String, android.os.UserHandle);
method public boolean isActivityEnabled(android.content.ComponentName, android.os.UserHandle);
method public boolean isActivityEnabledForProfile(android.content.ComponentName, android.os.UserHandle);
method public boolean isPackageEnabled(java.lang.String, android.os.UserHandle);
method public boolean isPackageEnabledForProfile(java.lang.String, android.os.UserHandle);
method public void registerCallback(android.content.pm.LauncherApps.Callback);
method public void registerCallback(android.content.pm.LauncherApps.Callback, android.os.Handler);
method public void removeCallback(android.content.pm.LauncherApps.Callback);
method public void removeOnAppsChangedCallback(android.content.pm.LauncherApps.OnAppsChangedCallback);
method public android.content.pm.LauncherActivityInfo resolveActivity(android.content.Intent, android.os.UserHandle);
method public void showAppDetailsForProfile(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startActivityForProfile(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startAppDetailsActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void startMainActivity(android.content.ComponentName, android.os.UserHandle, android.graphics.Rect, android.os.Bundle);
method public void unregisterCallback(android.content.pm.LauncherApps.Callback);
}
public static abstract class LauncherApps.Callback {
@@ -8643,10 +8638,6 @@ package android.content.pm {
method public abstract void onPackagesUnavailable(java.lang.String[], android.os.UserHandle, boolean);
}
public static abstract class LauncherApps.OnAppsChangedCallback extends android.content.pm.LauncherApps.Callback {
ctor public LauncherApps.OnAppsChangedCallback();
}
public class PackageInfo implements android.os.Parcelable {
ctor public PackageInfo();
method public int describeContents();

66
core/java/android/content/pm/LauncherApps.java
View File

@@ -278,21 +278,21 @@ public class LauncherApps {
/**
* Adds a callback for changes to packages in current and managed profiles.
* Registers a callback for changes to packages in current and managed profiles.
*
* @param callback The callback to add.
* @param callback The callback to register.
*/
public void addCallback(Callback callback) {
addCallback(callback, null);
public void registerCallback(Callback callback) {
registerCallback(callback, null);
}
/**
* Adds a callback for changes to packages in current and managed profiles.
* Registers a callback for changes to packages in current and managed profiles.
*
* @param callback The callback to add.
* @param callback The callback to register.
* @param handler that should be used to post callbacks on, may be null.
*/
public void addCallback(Callback callback, Handler handler) {
public void registerCallback(Callback callback, Handler handler) {
synchronized (this) {
if (callback != null && !mCallbacks.contains(callback)) {
boolean addedFirstCallback = mCallbacks.size() == 0;
@@ -308,12 +308,12 @@ public class LauncherApps {
}
/**
* Removes a callback that was previously added.
* Unregisters a callback that was previously registered.
*
* @param callback The callback to remove.
* @see #addCallback(Callback)
* @param callback The callback to unregister.
* @see #registerCallback(Callback)
*/
public void removeCallback(Callback callback) {
public void unregisterCallback(Callback callback) {
synchronized (this) {
removeCallbackLocked(callback);
if (mCallbacks.size() == 0) {
@@ -500,44 +500,12 @@ public class LauncherApps {
}
}
/** Remove after unbundled apps have migrated STOP SHIP */
public static abstract class OnAppsChangedCallback extends Callback {
/** STOPSHIP remove when launcher 3 has been updated */
public void addCallback(Callback callback) {
registerCallback(callback);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public void addOnAppsChangedCallback(OnAppsChangedCallback callback) {
addCallback(callback, null);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public void addOnAppsChangedCallback(OnAppsChangedCallback callback, Handler handler) {
addCallback(callback, handler);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public void removeOnAppsChangedCallback(OnAppsChangedCallback callback) {
removeCallback(callback);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public void startActivityForProfile(ComponentName component, UserHandle user, Rect sourceBounds,
Bundle opts) {
startMainActivity(component, user, sourceBounds, opts);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public void showAppDetailsForProfile(ComponentName component, UserHandle user,
Rect sourceBounds, Bundle opts) {
startAppDetailsActivity(component, user, sourceBounds, opts);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public boolean isPackageEnabledForProfile(String packageName, UserHandle user) {
return isPackageEnabled(packageName, user);
}
/** Remove after unbundled apps have migrated STOP SHIP */
public boolean isActivityEnabledForProfile(ComponentName component, UserHandle user) {
return isActivityEnabled(component, user);
/** STOPSHIP remove when launcher 3 has been updated */
public void removeCallback(Callback callback) {
unregisterCallback(callback);
}
}