diff options
Diffstat (limited to 'core/java/android')
-rw-r--r-- | core/java/android/app/DatePickerDialog.java | 4 | ||||
-rw-r--r-- | core/java/android/app/TimePickerDialog.java | 4 | ||||
-rw-r--r-- | core/java/android/webkit/WebView.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/AutoCompleteTextView.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/Button.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/CheckBox.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/DatePicker.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/EditText.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/GridView.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/ImageButton.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/LinearLayout.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/ListView.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/RadioButton.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/RatingBar.java | 3 | ||||
-rw-r--r-- | core/java/android/widget/RelativeLayout.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/Spinner.java | 11 | ||||
-rw-r--r-- | core/java/android/widget/Switch.java | 11 | ||||
-rw-r--r-- | core/java/android/widget/TimePicker.java | 4 | ||||
-rw-r--r-- | core/java/android/widget/ToggleButton.java | 4 |
19 files changed, 52 insertions, 37 deletions
diff --git a/core/java/android/app/DatePickerDialog.java b/core/java/android/app/DatePickerDialog.java index 3f0b4d4..d168800 100644 --- a/core/java/android/app/DatePickerDialog.java +++ b/core/java/android/app/DatePickerDialog.java @@ -33,8 +33,8 @@ import java.util.Calendar; /** * A simple dialog containing an {@link android.widget.DatePicker}. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Date Picker - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> + * guide.</p> */ public class DatePickerDialog extends AlertDialog implements OnClickListener, OnDateChangedListener { diff --git a/core/java/android/app/TimePickerDialog.java b/core/java/android/app/TimePickerDialog.java index d773bc8..952227f 100644 --- a/core/java/android/app/TimePickerDialog.java +++ b/core/java/android/app/TimePickerDialog.java @@ -30,8 +30,8 @@ import android.widget.TimePicker.OnTimeChangedListener; /** * A dialog that prompts the user for the time of day using a {@link TimePicker}. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Time Picker - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> + * guide.</p> */ public class TimePickerDialog extends AlertDialog implements OnClickListener, OnTimeChangedListener { diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 119fcd3..e493653 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -65,8 +65,8 @@ import java.util.Map; * href="{@docRoot}guide/topics/manifest/manifest-element.html">{@code <manifest>}</a> * element.</p> * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-webview.html">Web View - * tutorial</a>.</p> + * <p>For more information, read + * <a href="{@docRoot}guide/webapps/webview.html">Building Web Apps in WebView</a>.</p> * * <h3>Basic usage</h3> * diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index e5199f6..30dd17d 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -75,8 +75,8 @@ import com.android.internal.R; * } * </pre> * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-autocomplete.html">Auto Complete - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/text.html">Text Fields</a> + * guide.</p> * * @attr ref android.R.styleable#AutoCompleteTextView_completionHint * @attr ref android.R.styleable#AutoCompleteTextView_completionThreshold diff --git a/core/java/android/widget/Button.java b/core/java/android/widget/Button.java index 99f4cae..2ac56ac 100644 --- a/core/java/android/widget/Button.java +++ b/core/java/android/widget/Button.java @@ -83,8 +83,8 @@ import android.widget.RemoteViews.RemoteView; * href="{@docRoot}guide/topics/resources/drawable-resource.html#StateList">State List * Drawable</a>.</p> * - * <p>Also see the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a> for an example implementation of a button.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/button.html">Buttons</a> + * guide.</p> * * <p><strong>XML attributes</strong></p> * <p> diff --git a/core/java/android/widget/CheckBox.java b/core/java/android/widget/CheckBox.java index 858c415..f1804f8 100644 --- a/core/java/android/widget/CheckBox.java +++ b/core/java/android/widget/CheckBox.java @@ -44,8 +44,8 @@ import android.view.accessibility.AccessibilityNodeInfo; * } * </pre> * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/checkbox.html">Checkboxes</a> + * guide.</p> * * <p><strong>XML attributes</strong></p> * <p> diff --git a/core/java/android/widget/DatePicker.java b/core/java/android/widget/DatePicker.java index 108b720..ac3bedb 100644 --- a/core/java/android/widget/DatePicker.java +++ b/core/java/android/widget/DatePicker.java @@ -53,8 +53,8 @@ import java.util.TimeZone; * displayed. Also the minimal and maximal date from which dates to be selected * can be customized. * <p> - * See the <a href="{@docRoot}resources/tutorials/views/hello-datepicker.html">Date - * Picker tutorial</a>. + * See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> + * guide. * </p> * <p> * For a dialog using this view, see {@link android.app.DatePickerDialog}. diff --git a/core/java/android/widget/EditText.java b/core/java/android/widget/EditText.java index 2fd8768..57e51c2 100644 --- a/core/java/android/widget/EditText.java +++ b/core/java/android/widget/EditText.java @@ -38,8 +38,8 @@ import android.view.accessibility.AccessibilityNodeInfo; * EditText is a thin veneer over TextView that configures itself * to be editable. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/text.html">Text Fields</a> + * guide.</p> * <p> * <b>XML attributes</b> * <p> diff --git a/core/java/android/widget/GridView.java b/core/java/android/widget/GridView.java index ada7dd1..37e0b90 100644 --- a/core/java/android/widget/GridView.java +++ b/core/java/android/widget/GridView.java @@ -37,8 +37,8 @@ import android.widget.RemoteViews.RemoteView; * A view that shows items in two-dimensional scrolling grid. The items in the * grid come from the {@link ListAdapter} associated with this view. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-gridview.html">Grid - * View tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/layout/gridview.html">Grid + * View</a> guide.</p> * * @attr ref android.R.styleable#GridView_horizontalSpacing * @attr ref android.R.styleable#GridView_verticalSpacing diff --git a/core/java/android/widget/ImageButton.java b/core/java/android/widget/ImageButton.java index 59a8f28..379354c 100644 --- a/core/java/android/widget/ImageButton.java +++ b/core/java/android/widget/ImageButton.java @@ -64,8 +64,8 @@ import java.util.Map; * it will only be applied after {@code android:state_pressed} and {@code * android:state_focused} have both evaluated false.</p> * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/button.html">Buttons</a> + * guide.</p> * * <p><strong>XML attributes</strong></p> * <p> diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index 2391898..09c0129 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -41,8 +41,8 @@ import android.widget.RemoteViews.RemoteView; * {@link android.widget.LinearLayout.LayoutParams LinearLayout.LayoutParams}. * The default orientation is horizontal. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-linearlayout.html">Linear Layout - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/layout/linear.html">Linear Layout</a> + * guide.</p> * * <p> * Also see {@link LinearLayout.LayoutParams android.widget.LinearLayout.LayoutParams} diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index d2e55d9..e011c13 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -57,8 +57,8 @@ import java.util.ArrayList; * A view that shows items in a vertically scrolling list. The items * come from the {@link ListAdapter} associated with this view. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-listview.html">List View - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/layout/listview.html">List View</a> + * guide.</p> * * @attr ref android.R.styleable#ListView_entries * @attr ref android.R.styleable#ListView_divider diff --git a/core/java/android/widget/RadioButton.java b/core/java/android/widget/RadioButton.java index b1bb1c0..a0fef7d 100644 --- a/core/java/android/widget/RadioButton.java +++ b/core/java/android/widget/RadioButton.java @@ -38,8 +38,8 @@ import com.android.internal.R; * a radio group, checking one radio button unchecks all the others.</p> * </p> * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/radiobutton.html">Radio Buttons</a> + * guide.</p> * * <p><strong>XML attributes</strong></p> * <p> diff --git a/core/java/android/widget/RatingBar.java b/core/java/android/widget/RatingBar.java index 524d272..4d3c56c 100644 --- a/core/java/android/widget/RatingBar.java +++ b/core/java/android/widget/RatingBar.java @@ -43,9 +43,6 @@ import com.android.internal.R; * <p> * The secondary progress should not be modified by the client as it is used * internally as the background for a fractionally filled star. - * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a>.</p> * * @attr ref android.R.styleable#RatingBar_numStars * @attr ref android.R.styleable#RatingBar_rating diff --git a/core/java/android/widget/RelativeLayout.java b/core/java/android/widget/RelativeLayout.java index 29cf000..569cf99 100644 --- a/core/java/android/widget/RelativeLayout.java +++ b/core/java/android/widget/RelativeLayout.java @@ -56,8 +56,8 @@ import static android.util.Log.d; * {@link #ALIGN_PARENT_BOTTOM}. * </p> * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-relativelayout.html">Relative - * Layout tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/layout/relative.html">Relative + * Layout</a> guide.</p> * * <p> * Also see {@link android.widget.RelativeLayout.LayoutParams RelativeLayout.LayoutParams} for diff --git a/core/java/android/widget/Spinner.java b/core/java/android/widget/Spinner.java index 36d1ee0..64834b2 100644 --- a/core/java/android/widget/Spinner.java +++ b/core/java/android/widget/Spinner.java @@ -39,10 +39,16 @@ import android.view.accessibility.AccessibilityNodeInfo; * The items in the Spinner come from the {@link Adapter} associated with * this view. * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-spinner.html">Spinner - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/spinner.html">Spinners</a> guide.</p> * + * @attr ref android.R.styleable#Spinner_dropDownHorizontalOffset + * @attr ref android.R.styleable#Spinner_dropDownSelector + * @attr ref android.R.styleable#Spinner_dropDownVerticalOffset + * @attr ref android.R.styleable#Spinner_dropDownWidth + * @attr ref android.R.styleable#Spinner_gravity + * @attr ref android.R.styleable#Spinner_popupBackground * @attr ref android.R.styleable#Spinner_prompt + * @attr ref android.R.styleable#Spinner_spinnerMode */ @Widget public class Spinner extends AbsSpinner implements OnClickListener { @@ -409,6 +415,7 @@ public class Spinner extends AbsSpinner implements OnClickListener { /** * <p>A spinner does not support item click events. Calling this method * will raise an exception.</p> + * <p>Instead use {@link AdapterView#setOnItemSelectedListener}. * * @param l this listener will be ignored */ diff --git a/core/java/android/widget/Switch.java b/core/java/android/widget/Switch.java index 471f259..56f6651 100644 --- a/core/java/android/widget/Switch.java +++ b/core/java/android/widget/Switch.java @@ -53,6 +53,17 @@ import com.android.internal.R; * {@link #setSwitchTextAppearance(android.content.Context, int) switchTextAppearance} and * the related seSwitchTypeface() methods control that of the thumb. * + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a> + * guide.</p> + * + * @attr ref android.R.styleable#Switch_textOn + * @attr ref android.R.styleable#Switch_textOff + * @attr ref android.R.styleable#Switch_switchMinWidth + * @attr ref android.R.styleable#Switch_switchPadding + * @attr ref android.R.styleable#Switch_switchTextAppearance + * @attr ref android.R.styleable#Switch_thumb + * @attr ref android.R.styleable#Switch_thumbTextPadding + * @attr ref android.R.styleable#Switch_track */ public class Switch extends CompoundButton { private static final int TOUCH_MODE_IDLE = 0; diff --git a/core/java/android/widget/TimePicker.java b/core/java/android/widget/TimePicker.java index 18f7a91..cb9ed61 100644 --- a/core/java/android/widget/TimePicker.java +++ b/core/java/android/widget/TimePicker.java @@ -48,8 +48,8 @@ import java.util.Locale; * or 'P' to pick. For a dialog using this view, see * {@link android.app.TimePickerDialog}. *<p> - * See the <a href="{@docRoot}resources/tutorials/views/hello-timepicker.html">Time Picker - * tutorial</a>. + * See the <a href="{@docRoot}guide/topics/ui/controls/pickers.html">Pickers</a> + * guide. * </p> */ @Widget diff --git a/core/java/android/widget/ToggleButton.java b/core/java/android/widget/ToggleButton.java index 4beee96..cedc777 100644 --- a/core/java/android/widget/ToggleButton.java +++ b/core/java/android/widget/ToggleButton.java @@ -31,8 +31,8 @@ import com.android.internal.R; * Displays checked/unchecked states as a button * with a "light" indicator and by default accompanied with the text "ON" or "OFF". * - * <p>See the <a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff - * tutorial</a>.</p> + * <p>See the <a href="{@docRoot}guide/topics/ui/controls/togglebutton.html">Toggle Buttons</a> + * guide.</p> * * @attr ref android.R.styleable#ToggleButton_textOn * @attr ref android.R.styleable#ToggleButton_textOff |