diff options
| author | Scott Main <smain@google.com> | 2012-07-03 11:51:30 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-03 11:51:30 -0700 |
| commit | 5a883824a2e97e0ccb08b4fe30accde6542f3f39 (patch) | |
| tree | e792d6acac13a809c0baee69edb79059771819b7 | |
| parent | 399df5677bd116a016664a10a0da432da29e829d (diff) | |
| parent | 15279cfc566aee7f860ebfdfe9d4a6fbc0497362 (diff) | |
| download | base-5a883824a2e97e0ccb08b4fe30accde6542f3f39.tar.gz | |
Merge "docs: fix document issue 27549" into jb-dev
| -rw-r--r-- | core/java/android/widget/HorizontalScrollView.java | 11 | ||||
| -rw-r--r-- | core/java/android/widget/ScrollView.java | 9 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java index 8c6ce19e12b8..18c4fe631af3 100644 --- a/core/java/android/widget/HorizontalScrollView.java +++ b/core/java/android/widget/HorizontalScrollView.java @@ -47,18 +47,13 @@ import java.util.List; * is a {@link LinearLayout} in a horizontal orientation, presenting a horizontal * array of top-level items that the user can scroll through. * - * <p>You should never use a HorizontalScrollView with a {@link ListView}, since - * ListView takes care of its own scrolling. Most importantly, doing this - * defeats all of the important optimizations in ListView for dealing with - * large lists, since it effectively forces the ListView to display its entire - * list of items to fill up the infinite container supplied by HorizontalScrollView. - * * <p>The {@link TextView} class also - * takes care of its own scrolling, so does not require a ScrollView, but + * takes care of its own scrolling, so does not require a HorizontalScrollView, but * using the two together is possible to achieve the effect of a text view * within a larger container. * - * <p>HorizontalScrollView only supports horizontal scrolling. + * <p>HorizontalScrollView only supports horizontal scrolling. For vertical scrolling, + * use either {@link ScrollView} or {@link ListView}. * * @attr ref android.R.styleable#HorizontalScrollView_fillViewport */ diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java index 2a20c56c943d..ebc54f4527c8 100644 --- a/core/java/android/widget/ScrollView.java +++ b/core/java/android/widget/ScrollView.java @@ -49,13 +49,18 @@ import java.util.List; * manager with a complex hierarchy of objects. A child that is often used * is a {@link LinearLayout} in a vertical orientation, presenting a vertical * array of top-level items that the user can scroll through. - * + * <p>You should never use a ScrollView with a {@link ListView}, because + * ListView takes care of its own vertical scrolling. Most importantly, doing this + * defeats all of the important optimizations in ListView for dealing with + * large lists, since it effectively forces the ListView to display its entire + * list of items to fill up the infinite container supplied by ScrollView. * <p>The {@link TextView} class also * takes care of its own scrolling, so does not require a ScrollView, but * using the two together is possible to achieve the effect of a text view * within a larger container. * - * <p>ScrollView only supports vertical scrolling. + * <p>ScrollView only supports vertical scrolling. For horizontal scrolling, + * use {@link HorizontalScrollView}. * * @attr ref android.R.styleable#ScrollView_fillViewport */ |