summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-06-21 11:52:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-21 11:52:34 -0700
commit0a43f67ef3c2551ae051da7bf2e856ddc051298d (patch)
tree5afcc1c039e979de8b0083d7583c2cc6fbec819c /api
parent16613476c80f20736ef6bd3d217ab56aa57b03c9 (diff)
parent790024bfe6dd2765dd5e552053797459aab72da1 (diff)
downloadframeworks_base-0a43f67ef3c2551ae051da7bf2e856ddc051298d.zip
frameworks_base-0a43f67ef3c2551ae051da7bf2e856ddc051298d.tar.gz
frameworks_base-0a43f67ef3c2551ae051da7bf2e856ddc051298d.tar.bz2
am 790024bf: Merge "Unhide new methods on RemoteViews and Notification." into jb-dev
* commit '790024bfe6dd2765dd5e552053797459aab72da1': Unhide new methods on RemoteViews and Notification.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 9916e18..4017a36 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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);