Merge "docs: Fixing various minor issues" into mnc-mr-docs

am: 9780f94

* commit '9780f94dacd39cdc95919c8f313249d720e26bdf':
  docs: Fixing various minor issues

Change-Id: Ibec6838b6e6e8cf8e8d9be372c07e9678587a47d

4 files changed, 14 insertions, 6 deletions

diff --git a/docs/html-intl/intl/ja/training/tv/start/hardware.jd b/docs/html-intl/intl/ja/training/tv/start/hardware.jd
index ccf20fa45b9c..76fb56f26f1b 100755
--- a/docs/html-intl/intl/ja/training/tv/start/hardware.jd
+++ b/docs/html-intl/intl/ja/training/tv/start/hardware.jd
@@ -105,16 +105,20 @@ if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
 <pre>
 &lt;uses-feature android:name="android.hardware.touchscreen"
         android:required="false"/&gt;
+&lt;uses-feature android:name="android.hardware.faketouch"
+        android:required="false"/&gt;
 &lt;uses-feature android:name="android.hardware.telephony"
         android:required="false"/&gt;
 &lt;uses-feature android:name="android.hardware.camera"
         android:required="false"/&gt;
 &lt;uses-feature android:name="android.hardware.nfc"
         android:required="false"/&gt;
-&lt;uses-feature android:name="android.hardware.gps"
+&lt;uses-feature android:name="android.hardware.location.gps"
         android:required="false"/&gt;
 &lt;uses-feature android:name="android.hardware.microphone"
         android:required="false"/&gt;
+&lt;uses-feature android:name="android.hardware.sensor"
+        android:required="false"/&gt;
 </pre>
 
 <p>
diff --git a/docs/html/preview/features/direct-boot.jd b/docs/html/preview/features/direct-boot.jd
index d1530d7efe67..e6800fdaef56 100644
--- a/docs/html/preview/features/direct-boot.jd
+++ b/docs/html/preview/features/direct-boot.jd
@@ -71,7 +71,7 @@ run during Direct Boot mode, such as triggering a scheduled alarm.</p>
 intent filter for <code>LOCKED_BOOT_COMPLETED</code>, in the app manifest:</p>
 
 <pre>
-&lt;receiever
+&lt;receiver
   android:directBootAware="true" &gt;
   ...
   &lt;intent-filter&gt;
diff --git a/docs/html/training/tv/start/hardware.jd b/docs/html/training/tv/start/hardware.jd
index 9a66c0959964..97cf7ff6626d 100644
--- a/docs/html/training/tv/start/hardware.jd
+++ b/docs/html/training/tv/start/hardware.jd
@@ -115,6 +115,10 @@ if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
     <td>Sensors</td>
     <td>{@code android.hardware.sensor}</td>
   </tr>
+  <tr>
+    <td>Screen in portrait orientation</td>
+    <td>{@code android.hardware.screen.portrait}</td>
+  </tr>
 </table>
 
 <p id="cont-mic" class="note">
diff --git a/docs/html/training/tv/start/index.jd b/docs/html/training/tv/start/index.jd
index 5426ad76291d..cbd9b493dce2 100644
--- a/docs/html/training/tv/start/index.jd
+++ b/docs/html/training/tv/start/index.jd
@@ -50,6 +50,10 @@ startpage=true
     Getting Started with TV Apps</a></dt>
     <dd>Learn how to create a new Android Studio project for TV apps or modify your existing
       app project to run on TV devices.</dd>
+  <dt><a href="{@docRoot}training/tv/start/hardware.html">
+    Handling TV Hardware</a></dt>
+    <dd>Learn how to check if your app is running on TV hardware, handle unsupported hardware
+      features, and manage controller devices.</dd>
   <dt><a href="{@docRoot}training/tv/start/layouts.html">
     Building TV Layouts</a></dt>
     <dd>Learn the minimum requirements for TV layouts and how to implement them.</dd>
@@ -57,8 +61,4 @@ startpage=true
     Creating TV Navigation</a></dt>
     <dd>Learn the requirements for TV navigation and how to implement TV-compatible
       navigation.</dd>
-  <dt><a href="{@docRoot}training/tv/start/hardware.html">
-    Handling TV Hardware</a></dt>
-    <dd>Learn how to check if your app is running on TV hardware, handle unsupported hardware
-      features, and manage controller devices.</dd>
 </dl>