summaryrefslogtreecommitdiff
path: root/core/java/android/widget/Button.java
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-08-19 17:40:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-19 17:40:10 -0700
commitbb8d314b6c5ff9b51af29daa687d66dfd996914f (patch)
tree4d380b3cfc018f872d370407e44f2ba31e5deef4 /core/java/android/widget/Button.java
parentbbe5fb2b73172a6b42b3406354a3556bd53916e1 (diff)
parent70c9ffbc838271f0ea27a4780eb146287de53ef6 (diff)
am 70c9ffbc: am 11a72482: Merge "docs: add links from widget classes to tutorials" into froyo
Merge commit '70c9ffbc838271f0ea27a4780eb146287de53ef6' into gingerbread-plus-aosp * commit '70c9ffbc838271f0ea27a4780eb146287de53ef6': docs: add links from widget classes to tutorials
Diffstat (limited to 'core/java/android/widget/Button.java')
-rw-r--r--core/java/android/widget/Button.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/Button.java b/core/java/android/widget/Button.java
index 5e692d4fbbe1..176233e68735 100644
--- a/core/java/android/widget/Button.java
+++ b/core/java/android/widget/Button.java
@@ -48,6 +48,9 @@ import android.widget.RemoteViews.RemoteView;
* }
* </pre>
*
+ * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff
+ * tutorial</a>.</p>
+ *
* <p><strong>XML attributes</strong></p>
* <p>
* See {@link android.R.styleable#Button Button Attributes},