summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorquddusc <quddusc@google.com>2014-03-26 14:42:31 -0700
committerquddusc <quddusc@google.com>2014-03-26 15:03:06 -0700
commit3d7b134d08e7a4f334faa1bd3f3acc23081c0493 (patch)
treeef48b46fc4a7e83f7a1a31d3cacda01c1e47f419 /docs
parentd43c13009cb9e5e9abb430390e7da302335651e1 (diff)
downloadframeworks_base-3d7b134d08e7a4f334faa1bd3f3acc23081c0493.zip
frameworks_base-3d7b134d08e7a4f334faa1bd3f3acc23081c0493.tar.gz
frameworks_base-3d7b134d08e7a4f334faa1bd3f3acc23081c0493.tar.bz2
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus.
Bug: 13487101 Change-Id: If62a7415262877b7ef4ca19fcf0ab77c5323f1cb
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/game-controllers/controller-input.jd21
1 files changed, 14 insertions, 7 deletions
diff --git a/docs/html/training/game-controllers/controller-input.jd b/docs/html/training/game-controllers/controller-input.jd
index 2c50ae1..c9517ba 100644
--- a/docs/html/training/game-controllers/controller-input.jd
+++ b/docs/html/training/game-controllers/controller-input.jd
@@ -236,26 +236,33 @@ buttons.</p>
</tr>
<tr>
<td>Start game in main menu, or pause/unpause during game</td>
- <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_START BUTTON_START}</td>
+ <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_START BUTTON_START}<sup>*</sup></td>
</tr>
<tr>
<td>Display menu</td>
- <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_SELECT BUTTON_SELECT} and
-{@link android.view.KeyEvent#KEYCODE_MENU}</td>
+ <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_SELECT BUTTON_SELECT}<sup>*</sup>
+ and {@link android.view.KeyEvent#KEYCODE_MENU}<sup>*</sup></td>
</tr>
<tr>
<td>Same as Android <em>Back</em></td>
- <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_B BUTTON_B}<sup>*</sup> and
-{@link android.view.KeyEvent#KEYCODE_BACK KEYCODE_BACK}</td>
+ <td>{@link android.view.KeyEvent#KEYCODE_BACK KEYCODE_BACK}</td>
+ </tr>
+ <tr>
+ <td>Navigate back to a previous item in a menu</td>
+ <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_B BUTTON_B}<sup>**</sup></td>
</tr>
<tr>
<td>Confirm selection, or perform primary game action</td>
- <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_A BUTTON_A}<sup>*</sup> and
+ <td>{@link android.view.KeyEvent#KEYCODE_BUTTON_A BUTTON_A}<sup>**</sup> and
{@link android.view.KeyEvent#KEYCODE_DPAD_CENTER DPAD_CENTER}</td>
</tr>
</table>
<p>
-<em>* This could be the opposite button (A/B), depending on the locale that
+<em>* Your game should not rely on the presence of the Start, Select, or Menu
+ buttons.</em>
+</p>
+<p>
+<em>** This could be the opposite button (A/B), depending on the locale that
you are supporting.</em>
</p>