commit f09e309f7fa6f6f6882a2fb155ca08feae2acbda
author Daniel Yu <dsyu@google.com> Wed Apr 27 05:41:21 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 05:41:21 2016 +0000
tree bf2f81ffbe0242df6fc95152fe17c96a1e5a8008
parent 27076c7bfcbe8623e608d31f8697241ee6855508
parent d563c253911b5ad86804b474acbc931d27572d2a

Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94 am: cf35d40
am: d563c25

* commit 'd563c253911b5ad86804b474acbc931d27572d2a':
  docs: Fixing various minor issues

Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292

docs/html-intl/intl/ja/training/tv/start/hardware.jd

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 ccf20fa..76fb56f 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 @@
 <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>

docs/html/preview/features/direct-boot.jd

diff --git a/docs/html/preview/features/direct-boot.jd b/docs/html/preview/features/direct-boot.jd
index d1530d7..e6800fd 100644
--- a/docs/html/preview/features/direct-boot.jd
+++ b/docs/html/preview/features/direct-boot.jd
@@ -71,7 +71,7 @@
 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;

docs/html/training/tv/start/hardware.jd

diff --git a/docs/html/training/tv/start/hardware.jd b/docs/html/training/tv/start/hardware.jd
index 9a66c09..97cf7ff 100644
--- a/docs/html/training/tv/start/hardware.jd
+++ b/docs/html/training/tv/start/hardware.jd
@@ -115,6 +115,10 @@
     <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">

docs/html/training/tv/start/index.jd

diff --git a/docs/html/training/tv/start/index.jd b/docs/html/training/tv/start/index.jd
index 5426ad7..cbd9b49 100644
--- a/docs/html/training/tv/start/index.jd
+++ b/docs/html/training/tv/start/index.jd
@@ -50,6 +50,10 @@
     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 @@
     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>