Merge "DOC CHANGE: AOSP 33831 - Typo" into jb-dev
diff --git a/core/java/android/widget/HorizontalScrollView.java b/core/java/android/widget/HorizontalScrollView.java
index 8c6ce19..18c4fe6 100644
--- a/core/java/android/widget/HorizontalScrollView.java
+++ b/core/java/android/widget/HorizontalScrollView.java
@@ -47,18 +47,13 @@
* 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 2a20c56..ebc54f4 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -49,13 +49,18 @@
* 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
*/
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 65e52ad..8930c7f 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -14,7 +14,7 @@
<ul>
<li class="item carousel-home">
<div class="content-left col-9">
- <a href="/about/versions/jelly-bean.html"><img src="/images/home/android-jellybean.png" ></a>
+ <a href="{@docRoot}about/versions/jelly-bean.html"><img src="{@docRoot}images/home/android-jellybean.png" ></a>
</div>
<div class="content-right col-6">
<h1>Jelly Bean now available!</h1>
@@ -23,7 +23,7 @@
<p>New APIs are also available that allow you to build richer and more
interactive notifications, transfer larger
payloads through NFC, discover services over Wi-Fi, and much more.</p>
- <p><a href="/about/versions/jelly-bean.html" class="button">More
+ <p><a href="{@docRoot}about/versions/jelly-bean.html" class="button">More
about Jelly Bean</a></p>
</div>
</li>
@@ -35,12 +35,12 @@
<h1>Make your Android apps<br>look great</h1>
<p>New templates in the design guide make it easier than ever to design apps
that are beautiful and easy to use.</p>
- <p><a href="/design/index.html" class="button">Learn More</a></p>
+ <p><a href="{@docRoot}design/index.html" class="button">Learn More</a></p>
</div>
</li>
<li class="item carousel-home">
<div class="content-left col-10">
- <img src="/images/home/google-io.png">
+ <img src="{@docRoot}images/home/google-io.png">
</div>
<div class="content-right col-5">
<h1>Watch Android at <br/>Google I/O!</h1>
@@ -52,7 +52,7 @@
</li>
<li class="item carousel-home">
<div class="content-left col-10">
- <img src="/images/home/google-play.png"
+ <img src="{@docRoot}images/home/google-play.png"
style="margin-top:50px">
</div>
<div class="content-right col-5">
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index c0838c2..b9e88a4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -1926,9 +1926,14 @@
synchronized (mQueueLock) {
pw.println("Current Status Bar state:");
pw.println(" mExpanded=" + mExpanded
- + ", mExpandedVisible=" + mExpandedVisible);
+ + ", mExpandedVisible=" + mExpandedVisible
+ + ", mTrackingPosition=" + mTrackingPosition);
pw.println(" mTicking=" + mTicking);
pw.println(" mTracking=" + mTracking);
+ pw.println(" mNotificationPanel=" +
+ ((mNotificationPanel == null)
+ ? "null"
+ : (mNotificationPanel + " params=" + mNotificationPanel.getLayoutParams().debug(""))));
pw.println(" mAnimating=" + mAnimating
+ ", mAnimY=" + mAnimY + ", mAnimVel=" + mAnimVel
+ ", mAnimAccel=" + mAnimAccel);