diff options
| author | quddusc <quddusc@google.com> | 2014-04-05 22:32:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-05 22:32:35 +0000 |
| commit | 17878a9ab5c58f5b245bbdd0e8e16abbcde4a995 (patch) | |
| tree | b919b9dad525dff6dd98e8ae0bf41248c24c6719 /docs/html | |
| parent | 819239e5bec90ee3c861ac45fffac4a832a183a1 (diff) | |
| parent | b430ec756473330f47bda2d8f0c266b3398169c9 (diff) | |
| download | frameworks_base-17878a9ab5c58f5b245bbdd0e8e16abbcde4a995.zip frameworks_base-17878a9ab5c58f5b245bbdd0e8e16abbcde4a995.tar.gz frameworks_base-17878a9ab5c58f5b245bbdd0e8e16abbcde4a995.tar.bz2 | |
am b430ec75: am 7db3875c: Merge "docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101" into klp-docs
* commit 'b430ec756473330f47bda2d8f0c266b3398169c9':
docs: Fixed gamepad mapping doc to recommend that B button should be used for back navigation in menus. Bug: 13487101
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/training/game-controllers/controller-input.jd | 21 |
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> |