diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-09-21 16:56:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 16:56:31 -0700 |
| commit | 8562cb59825a9ccff2b019d2c30f38c8798ca3a1 (patch) | |
| tree | d432bba0fbeb744fd4f9348d96664bd6097a1c61 | |
| parent | 38533ea514a452d0fa3aa38557f6e461cb46f402 (diff) | |
| parent | bd1e0076c66084da702a789db90e77c6ca645fe2 (diff) | |
| download | frameworks_base-8562cb59825a9ccff2b019d2c30f38c8798ca3a1.zip frameworks_base-8562cb59825a9ccff2b019d2c30f38c8798ca3a1.tar.gz frameworks_base-8562cb59825a9ccff2b019d2c30f38c8798ca3a1.tar.bz2 | |
Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 8896ae8..df5429d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29005,7 +29005,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 87ef23f..1a47ce2 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 |