Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs
diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 3eb0052..6a7a34f 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -723,7 +723,7 @@
*
* @param view The view whose scroll state is being reported
*
- * @param scrollState The current scroll state. One of {@link #SCROLL_STATE_IDLE},
+ * @param scrollState The current scroll state. One of
* {@link #SCROLL_STATE_TOUCH_SCROLL} or {@link #SCROLL_STATE_IDLE}.
*/
public void onScrollStateChanged(AbsListView view, int scrollState);
diff --git a/docs/html/tools/testing/activity_test.jd b/docs/html/tools/testing/activity_test.jd
index 2d1a5bf..036407a 100644
--- a/docs/html/tools/testing/activity_test.jd
+++ b/docs/html/tools/testing/activity_test.jd
@@ -443,12 +443,11 @@
</p>
<pre>
public SpinnerActivityTest() {
- super("com.android.example.spinner", SpinnerActivity.class);
+ super(SpinnerActivity.class);
} // end of SpinnerActivityTest constructor definition
</pre>
<p>
- This calls the superclass constructor with the Android package name (<code>com.android.example.spinner</code>)and main activity's class
- (<code>SpinnerActivity.class</code>) for the application under test. Android uses this information to find the application and activity to test.
+ This calls the superclass constructor with the main activity's class (<code>SpinnerActivity.class</code>) for the application under test. Android uses this information to find the application and activity to test.
</p>
<p>
You are now ready to add tests, by adding test methods to the class.
diff --git a/docs/html/training/app-indexing/index.jd b/docs/html/training/app-indexing/index.jd
index 6965ce5..cb4135f 100644
--- a/docs/html/training/app-indexing/index.jd
+++ b/docs/html/training/app-indexing/index.jd
@@ -1,4 +1,4 @@
-page.title=Making Your App Searchable
+page.title=Making Your App Content Searchable by Google
page.tags="app indexing"
trainingnavtop=true
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index f256eb4..9e265ec 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -842,7 +842,7 @@
"How to enable deep linking and indexing of your application
content so that users can open this content directly from their mobile search
results."
- >Making Your App Content Searchable</a>
+ >Making Your App Content Searchable by Google</a>
</div>
<ul>
<li><a href="<?cs var:toroot ?>training/app-indexing/deep-linking.html">