From a687045045157eab2dbf657bb085cb0af68d72f2 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Tue, 28 Jun 2011 20:25:43 -0700 Subject: cherrypick from Change-Id: I1f95ed281c3152a47d5a3c8b927ae2a23568ed1e docs: fix game controller trademarks Change-Id: I1eca030bad5bae0c581000fefffd5d3d49aac205 --- docs/html/sdk/android-3.1-highlights.jd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/html') diff --git a/docs/html/sdk/android-3.1-highlights.jd b/docs/html/sdk/android-3.1-highlights.jd index 3d132a3..88bc1ee 100644 --- a/docs/html/sdk/android-3.1-highlights.jd +++ b/docs/html/sdk/android-3.1-highlights.jd @@ -143,8 +143,8 @@ point, select, drag, scroll, hover, and other standard actions.

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.

-

For example, users can connect Sony Playstation™ 3 and XBox 360™ game -controllers over USB (but not Bluetooth), Logitech Dual Action™ gamepads and +

For example, users can connect PlayStation®3 and Xbox 360® +game controllers over USB (but not Bluetooth), Logitech Dual Action™ 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.

-- cgit v1.1