drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a6870450: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks

Browse Source 
* commit 'a687045045157eab2dbf657bb085cb0af68d72f2':
  cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks
This commit is contained in:
Scott Main
2011-06-28 20:50:12 -07:00
committed by Android Git Automerger
parent 29d1dde972 a687045045
commit d3cc051dcb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/html/sdk/android-3.1-highlights.jd
View File

@ -143,8 +143,8 @@ point, select, drag, scroll, hover, and other standard actions.</p>
<p>To make the platform even better for gaming, Android 3.1 adds support for
most PC joysticks and gamepads that are connected over USB or Bluetooth HID.</p>
<p>For example, users can connect Sony Playstation&trade; 3 and XBox 360&trade; game
controllers over USB (but not Bluetooth), Logitech Dual Action&trade; gamepads and
<p>For example, users can connect PlayStation<sup>&reg;</sup>3 and Xbox 360<sup>&reg;</sup>
game controllers over USB (but not Bluetooth), Logitech Dual Action&trade; gamepads and
flight sticks, or a car racing controller. Game controllers that use proprietary
networking or pairing are not supported by default, but in general, the platform
supports most PC-connectible joysticks and gamepads.</p>