From ff5e334e7a56f1cf2c230bf13b60d90f5e9f131c Mon Sep 17 00:00:00 2001
From: Daniel Yu <dsyu@google.com>
Date: Thu, 1 Oct 2015 11:39:36 -0700
Subject: [PATCH] docs: Fixing controller support example for bug 22727418 and
 24098562

As per Robert Anderberg's recommendation, removed the manifest example that
doesn't include android:required="false" and updated description text to
indicate the example works with apps that "support" a game controller rather
than "require". Updated Robert's suggestion with more concise version from
Andrew's suggestion. Note that we're not adding info on specifying
android:required="true" because this causes the app to not be installable on
any devices (because controllers aren't currently considered part of a device,
so it ends up looking like no devices have controllers at install time)

Bug: 22727418
Bug: 24098562
Change-Id: Ie4dd02d5599b9ffda53e46dc5af4765d888e81a4
---
 docs/html/training/tv/games/index.jd | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/docs/html/training/tv/games/index.jd b/docs/html/training/tv/games/index.jd
index 7a3365df49abd..73336d0da9d7e 100644
--- a/docs/html/training/tv/games/index.jd
+++ b/docs/html/training/tv/games/index.jd
@@ -225,24 +225,20 @@ It includes a white controller on black background and a black controller on whi
 
 <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>