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 /core/java/android/widget/RemoteViews.java | |
| parent | 49d03616abef47f08347a58f60b55174a52a469e (diff) | |
| parent | 0a43f67ef3c2551ae051da7bf2e856ddc051298d (diff) | |
resolved conflicts for merge of 0a43f67e to master
Change-Id: I072b756bc501c7669593eff012b120905a2fd962
Diffstat (limited to 'core/java/android/widget/RemoteViews.java')
| -rw-r--r-- | core/java/android/widget/RemoteViews.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 331d2085da28..96c53d4c340f 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -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 @@ -1665,7 +1664,11 @@ public class RemoteViews implements Parcelable, Filter { * layout direction), or 0 * @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 +<<<<<<< HEAD * @param bottom The id of a drawable to place below the text, or 0 +======= + * @param bottom The id of a drawable to place below the text, or 0 +>>>>>>> 0a43f67e */ public void setTextViewCompoundDrawablesRelative(int viewId, int start, int top, int end, int bottom) { addAction(new TextViewDrawableAction(viewId, true, start, top, end, bottom)); @@ -1901,7 +1904,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 |