From bd1e0076c66084da702a789db90e77c6ca645fe2 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Fri, 21 Sep 2012 16:51:50 -0700 Subject: [PATCH] Changing public method to @hide, doesn't have to be public Change-Id: I4c87b154fd99376a0337f9fc65024e13ddb74da5 --- api/current.txt | 1 - core/java/android/widget/RemoteViews.java | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index c7ce8aa7d9e2f..1fcad444ba2e9 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28971,7 +28971,6 @@ package android.widget { method public int describeContents(); method public int getLayoutId(); method public java.lang.String getPackage(); - method public void mergeRemoteViews(android.widget.RemoteViews); method public boolean onLoadClass(java.lang.Class); method public void reapply(android.content.Context, android.view.View); method public void removeAllViews(int); diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 87ef23f8db6e5..1a47ce2fa24b4 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -222,6 +222,14 @@ public class RemoteViews implements Parcelable, Filter { int viewId; } + /** + * Merges the passed RemoteViews actions with this RemoteViews actions according to + * action-specific merge rules. + * + * @param newRv + * + * @hide + */ public void mergeRemoteViews(RemoteViews newRv) { // We first copy the new RemoteViews, as the process of merging modifies the way the actions // reference the bitmap cache. We don't want to modify the object as it may need to