diff options
| author | Chris Wren <cwren@android.com> | 2012-06-21 16:46:14 -0400 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2012-06-21 16:46:14 -0400 |
| commit | bae2fe870af85ced407525735b2849ea0b2a1673 (patch) | |
| tree | ee8b012ae14ed9479dfd1baa0596b10d4e5db2c8 /api | |
| parent | 49d03616abef47f08347a58f60b55174a52a469e (diff) | |
| parent | 0a43f67ef3c2551ae051da7bf2e856ddc051298d (diff) | |
| download | frameworks_base-bae2fe870af85ced407525735b2849ea0b2a1673.zip frameworks_base-bae2fe870af85ced407525735b2849ea0b2a1673.tar.gz frameworks_base-bae2fe870af85ced407525735b2849ea0b2a1673.tar.bz2 | |
resolved conflicts for merge of 0a43f67e to master
Change-Id: I072b756bc501c7669593eff012b120905a2fd962
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 552aa49..793b431 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3768,6 +3768,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); @@ -28265,7 +28266,9 @@ package android.widget { 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); |