Merge "docs: InfoPros, Project 02, Batch 03" into mnc-mr-docs am: d00f005 am: 94e5237

am: b79b808

* commit 'b79b80882c34f0c540e84c7a3a90b73c617e0635':
  docs: InfoPros, Project 02, Batch 03

Change-Id: Iccf5c61e7c9a7da81d8df114076a94a86983e247

diff --cc docs/html/guide/practices/screens-distribution.jd
Simple merge

diff --cc docs/html/guide/topics/media/mediarouter.jd
Simple merge

diff --cc docs/html/guide/topics/search/search-dialog.jd
Simple merge

diff --cc docs/html/guide/topics/ui/accessibility/apps.jd
index 567dc5b,47e2eff..90781f7
--- 1/docs/html/guide/topics/ui/accessibility/apps.jd
--- 2/docs/html/guide/topics/ui/accessibility/apps.jd
+++ b/docs/html/guide/topics/ui/accessibility/apps.jd
@@@ -536,17 -536,8 +536,8 @@@ ViewCompat.setAccessibilityDelegate(ne
  directly in your custom view class. For another example of this approach, see the Android
  <a href="{@docRoot}tools/support-library/index.html">Support Library</a> (revision 5 or higher)
  sample {@code AccessibilityDelegateSupportActivity} in
 -({@code &lt;sdk&gt;/extras/android/support/v4/samples/Support4Demos/}).</p>
 +({@code <sdk>/extras/android/support/v4/samples/Support4Demos/}).</p>
  
- <p class="note"><strong>Note:</strong> You may find information on implementing accessibility for
- custom views written prior to Android 4.0 that describes the use of the
- {@link android.view.View#dispatchPopulateAccessibilityEvent dispatchPopulateAccessibilityEvent()}
- method for populating AccessibilityEvents. As of the Android 4.0 release, however, the recommended
- approach is to use the
- {@link android.view.View#onPopulateAccessibilityEvent onPopulateAccessibilityEvent()} and
- {@link android.view.View#onInitializeAccessibilityEvent onInitializeAccessibilityEvent()}
- methods.</p>
- 
  
  <h3 id="virtual-hierarchy">Providing a customized accessibility context</h3>
  

diff --cc docs/html/guide/topics/ui/accessibility/services.jd
Simple merge

diff --cc docs/html/guide/topics/ui/settings.jd
index 89960bb,3e45c5c..243c1c3
--- 1/docs/html/guide/topics/ui/settings.jd
--- 2/docs/html/guide/topics/ui/settings.jd
+++ b/docs/html/guide/topics/ui/settings.jd
@@@ -717,9 -717,9 +717,9 @@@ Android 3.0 ({@code res/xml/preference_
  </PreferenceScreen>
  </pre>
  
 -<p>Because support for {@code &lt;preference-headers>} was added in Android 3.0, the system calls
 +<p>Because support for {@code <preference-headers>} was added in Android 3.0, the system calls
  {@link android.preference.PreferenceActivity#onBuildHeaders onBuildHeaders()} in your {@link
- android.preference.PreferenceActivity} only when running on Androd 3.0 or higher. In order to load
+ android.preference.PreferenceActivity} only when running on Android 3.0 or higher. In order to load
  the "legacy" headers file ({@code preference_headers_legacy.xml}), you must check the Android
  version and, if the version is older than Android 3.0 ({@link
  android.os.Build.VERSION_CODES#HONEYCOMB}), call {@link