Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f09e309f authored by Daniel Yu's avatar Daniel Yu Committed by android-build-merger
Browse files

Merge "docs: Fixing various minor issues" into mnc-mr-docs am: 9780f94d am: cf35d40c 

am: d563c253

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

Change-Id: Ied80c3fc5cbe1af6fce8a006af698170601bf292
parents 27076c7b d563c253

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

+5 −1
Original line number Diff line number Diff line
@@ -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>

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+4 −0
Original line number Diff line number Diff line
@@ -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">

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

+4 −4
Original line number Diff line number Diff line
@@ -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>