Skip to content

Commit 75bea2e

Browse files
scottamainAndroid Git Automerger
authored andcommitted
am 7c00f81: am 2f5b61a: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
* commit '7c00f81606de1880c3f28e54cea064c3b90da3e7': docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
2 parents 23ecb2c + 7c00f81 commit 75bea2e

19 files changed

+52
-37
lines changed

core/java/android/app/DatePickerDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
/**
3434
* A simple dialog containing an {@link android.widget.DatePicker}.
3535
*
36-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Date Picker
37-
* tutorial</a>.</p>
36+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
37+
* guide.</p>
3838
*/
3939
public class DatePickerDialog extends AlertDialog implements OnClickListener,
4040
OnDateChangedListener {

core/java/android/app/TimePickerDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
/**
3131
* A dialog that prompts the user for the time of day using a {@link TimePicker}.
3232
*
33-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Time Picker
34-
* tutorial</a>.</p>
33+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
34+
* guide.</p>
3535
*/
3636
public class TimePickerDialog extends AlertDialog
3737
implements OnClickListener, OnTimeChangedListener {

core/java/android/webkit/WebView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
* href="{@docRoot}guide/topics/manifest/manifest-element.html">{@code <manifest>}</a>
6767
* element.</p>
6868
*
69-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-webview.html">Web View
70-
* tutorial</a>.</p>
69+
* <p>For more information, read
70+
* <a href="{@docRoot}guide/webapps/webview.html">Building Web Apps in WebView</a>.</p>
7171
*
7272
* <h3>Basic usage</h3>
7373
*

core/java/android/widget/AutoCompleteTextView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
* }
7676
* </pre>
7777
*
78-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-autocomplete.html">Auto Complete
79-
* tutorial</a>.</p>
78+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/text.html">Text Fields</a>
79+
* guide.</p>
8080
*
8181
* @attr ref android.R.styleable#AutoCompleteTextView_completionHint
8282
* @attr ref android.R.styleable#AutoCompleteTextView_completionThreshold

core/java/android/widget/Button.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
* href="{@docRoot}guide/topics/resources/drawable-resource.html#StateList">State List
8484
* Drawable</a>.</p>
8585
*
86-
* <p>Also see the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff
87-
* tutorial</a> for an example implementation of a button.</p>
86+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/button.html">Buttons</a>
87+
* guide.</p>
8888
*
8989
* <p><strong>XML attributes</strong></p>
9090
* <p>

core/java/android/widget/CheckBox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
* }
4646
* </pre>
4747
*
48-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff
49-
* tutorial</a>.</p>
48+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/checkbox.html">Checkboxes</a>
49+
* guide.</p>
5050
*
5151
* <p><strong>XML attributes</strong></p>
5252
* <p>

core/java/android/widget/DatePicker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
* displayed. Also the minimal and maximal date from which dates to be selected
5454
* can be customized.
5555
* <p>
56-
* See the <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Date
57-
* Picker tutorial</a>.
56+
* See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a>
57+
* guide.
5858
* </p>
5959
* <p>
6060
* For a dialog using this view, see {@link android.app.DatePickerDialog}.

core/java/android/widget/EditText.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
* EditText is a thin veneer over TextView that configures itself
4141
* to be editable.
4242
*
43-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff
44-
* tutorial</a>.</p>
43+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/text.html">Text Fields</a>
44+
* guide.</p>
4545
* <p>
4646
* <b>XML attributes</b>
4747
* <p>

core/java/android/widget/GridView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
* A view that shows items in two-dimensional scrolling grid. The items in the
3838
* grid come from the {@link ListAdapter} associated with this view.
3939
*
40-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-gridview.html">Grid
41-
* View tutorial</a>.</p>
40+
* <p>See the <a href="{@docRoot}guide/topics/ui/layout/gridview.html">Grid
41+
* View</a> guide.</p>
4242
*
4343
* @attr ref android.R.styleable#GridView_horizontalSpacing
4444
* @attr ref android.R.styleable#GridView_verticalSpacing

core/java/android/widget/ImageButton.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@
6464
* it will only be applied after {@code android:state_pressed} and {@code
6565
* android:state_focused} have both evaluated false.</p>
6666
*
67-
* <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff
68-
* tutorial</a>.</p>
67+
* <p>See the <a href="{@docRoot}guide/topics/ui/controls/button.html">Buttons</a>
68+
* guide.</p>
6969
*
7070
* <p><strong>XML attributes</strong></p>
7171
* <p>

0 commit comments

Comments
 (0)