am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev

* commit '790024bfe6dd2765dd5e552053797459aab72da1':
  Unhide new methods on RemoteViews and Notification.
This commit is contained in:
Daniel Sandler
2012-06-21 11:52:34 -07:00
committed by Android Git Automerger
3 changed files with 4 additions and 4 deletions

View File

@@ -3760,6 +3760,7 @@ package android.app {
public static class Notification.BigPictureStyle extends android.app.Notification.Style {
ctor public Notification.BigPictureStyle();
ctor public Notification.BigPictureStyle(android.app.Notification.Builder);
method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);
method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);
method public android.app.Notification build();
method public android.app.Notification.BigPictureStyle setBigContentTitle(java.lang.CharSequence);
@@ -28182,8 +28183,11 @@ package android.widget {
method public void setString(int, java.lang.String, java.lang.String);
method public void setTextColor(int, int);
method public void setTextViewCompoundDrawables(int, int, int, int, int);
method public void setTextViewCompoundDrawablesRelative(int, int, int, int, int);
method public void setTextViewText(int, java.lang.CharSequence);
method public void setTextViewTextSize(int, int, float);
method public void setUri(int, java.lang.String, android.net.Uri);
method public void setViewPadding(int, int, int, int, int);
method public void setViewVisibility(int, int);
method public void showNext(int);
method public void showPrevious(int);

View File

@@ -1733,7 +1733,6 @@ public class Notification implements Parcelable
}
/**
* @hide
* Override the large icon when the big notification is shown.
*/
public BigPictureStyle bigLargeIcon(Bitmap b) {

View File

@@ -1631,7 +1631,6 @@ public class RemoteViews implements Parcelable, Filter {
}
/**
* @hide
* Equivalent to calling {@link TextView#setTextSize(int, float)}
*
* @param viewId The id of the view whose text size should change
@@ -1663,7 +1662,6 @@ public class RemoteViews implements Parcelable, Filter {
* @param top The id of a drawable to place above the text, or 0
* @param end The id of a drawable to place after the text, or 0
* @param bottom The id of a drawable to place below the text, or 0
* @hide
*/
public void setTextViewCompoundDrawablesRelative(int viewId, int start, int top, int end, int bottom) {
addAction(new TextViewDrawableAction(viewId, true, start, top, end, bottom));
@@ -1899,7 +1897,6 @@ public class RemoteViews implements Parcelable, Filter {
}
/**
* @hide
* Equivalent to calling {@link View#setPadding(int, int, int, int)}.
*
* @param viewId The id of the view to change