commit bc35ea14ebc9c043628d6aa70dd6fecac6753ef5
author Dan Yu <dsyu@google.com> Mon Oct 12 16:27:38 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 12 16:27:38 2015 +0000
tree 34f2495de08ae41e885185731f3751e30d3a55d3
parent e20dda71cd687771a143e9fc86a6510671040ea8
parent ff5e334e7a56f1cf2c230bf13b60d90f5e9f131c

Merge "docs: Fixing controller support example for bug 22727418 and 24098562" into mnc-docs

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

diff --git a/docs/html/training/tv/games/index.jd b/docs/html/training/tv/games/index.jd
index 7a3365d..73336d0 100644
--- a/docs/html/training/tv/games/index.jd
+++ b/docs/html/training/tv/games/index.jd
@@ -225,24 +225,20 @@
 
 <p>
   Games controllers may not be available or active for users of a TV device. In order to properly
-  inform users that your game requires (or just supports) a game controller, you must include
-  entries in the app manifest. If your game requires a game controller, you must include the
-  following entry in your app manifest:
-</p>
-
-<pre>
-  &lt;uses-feature android:name="android.hardware.gamepad"/&gt;
-</pre>
-
-<p>
-  If your game uses, but does not require, a game controller, include the following feature
-  entry in your app manifest:
+  inform users that your game supports a game controller, you must include the following entry in
+  your app manifest:
 </p>
 
 <pre>
   &lt;uses-feature android:name="android.hardware.gamepad" android:required="false"/&gt;
 </pre>
 
+<p class="note">
+  <strong>Note:</strong> When specifying {@code android:hardware:gamepad} support, do not set the
+  {@code android:required} attribute to {@code "true"}. If you do this, users won’t be able to
+  install your app on TV devices.
+</p>
+
 <p>For more information about manifest entries, see
   <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">App Manifest</a>.
 </p>