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

Commit dce17917 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev 

* commit '8562cb59':
  Changing public method to @hide, doesn't have to be public
parents a586a3c9 8562cb59

api/current.txt

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

core/java/android/widget/RemoteViews.java

+8 −0
Original line number Diff line number Diff line
@@ -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