From 2d006d2fb2d053392324769971c3a10d8ad93ac4 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Mon, 16 Sep 2013 13:11:07 -0700 Subject: more string changes for wi-fi trademark compliance Change-Id: Iee87c7d627e724f212d4a378815a77ff056d0dec --- docs/html/about/index.jd | 2 +- docs/html/about/versions/android-4.0-highlights.jd | 34 +++++++++++++--------- docs/html/about/versions/android-4.0.jd | 14 +++++---- docs/html/about/versions/jelly-bean.jd | 31 ++++++++++++-------- docs/html/guide/topics/connectivity/index.jd | 2 +- .../connect-devices-wirelessly/nsd-wifi-direct.jd | 3 -- .../training/connect-devices-wirelessly/nsd.jd | 4 --- .../connect-devices-wirelessly/wifi-direct.jd | 6 ++-- docs/html/training/training_toc.cs | 2 +- 9 files changed, 54 insertions(+), 44 deletions(-) diff --git a/docs/html/about/index.jd b/docs/html/about/index.jd index 1573cc3..215fc3c 100644 --- a/docs/html/about/index.jd +++ b/docs/html/about/index.jd @@ -53,7 +53,7 @@ differentiated applications.

multitude of device form-factors, chipset architectures, and price points. From multicore processing and high-performance graphics to state-of-the-art sensors, vibrant touchscreens, and emerging mobile technologies such as Near Field -Communication (NFC), Wi-Fi Direct, and face tracking.

--> +Communication (NFC), Wi-Fi P2P, and face tracking.

-->

Powerful development framework

diff --git a/docs/html/about/versions/android-4.0-highlights.jd b/docs/html/about/versions/android-4.0-highlights.jd index 9fdb02c..f2b35ac 100644 --- a/docs/html/about/versions/android-4.0-highlights.jd +++ b/docs/html/about/versions/android-4.0-highlights.jd @@ -610,14 +610,17 @@ unlocking the device. Users just hold their devices in front of their faces to unlock, or use a backup PIN or pattern.

-

Wi-Fi Direct and Bluetooth HDP

+

Wi-Fi P2P and Bluetooth HDP

+ +

Support for Wi-Fi peer-to-peer (P2P) lets users connect directly to nearby peer +devices over Wi-Fi, for more reliable, higher-speed communication (in compliance with the Wi-Fi +Alliance's Wi-Fi Direct™ +certification program). No internet connection or tethering is needed. Through third-party apps, +users can connect to compatible devices to take advantage of new features such as instant sharing +of files, photos, or other media; streaming video or audio from another device; or connecting to +compatible printers or other devices.

-

Support for Wi-Fi Direct lets users connect directly to -nearby peer devices over Wi-Fi, for more reliable, higher-speed communication. -No internet connection or tethering is needed. Through third-party apps, users -can connect to compatible devices to take advantage of new features such as -instant sharing of files, photos, or other media; streaming video or audio from -another device; or connecting to compatible printers or other devices.

Android 4.0 also introduces built-in support for connecting to Bluetooth Health Device Profile (HDP) devices. With support from third-party apps, users can connect to wireless medical devices and sensors in hospitals, fitness centers, homes, and elsewhere.

@@ -868,16 +871,19 @@ VP8 content.

New types of connectivity

-

Wi-Fi Direct

+

Wi-Fi P2P

+ +

Developers can use a framework API to discover and connect directly to nearby devices over a +high-performance, secure Wi-Fi peer-to-peer (P2P) connection. No internet connection or hotspot is +needed. Android's Wi-Fi P2P framework complies with the Wi-Fi Alliance's Wi-Fi Direct™ +certification program.

-

Developers can use a framework API to discover and connect directly to nearby -devices over a high-performance, secure Wi-Fi Direct connection. No internet -connection or hotspot is needed.

-

Wi-Fi Direct opens new opportunities for developers to add innovative -features to their applications. Applications can use Wi-Fi Direct to share +

Wi-Fi peer-to-peer (P2P) opens new opportunities for developers to add innovative +features to their applications. Applications can use Wi-Fi P2P to share files, photos, or other media between devices or between a desktop computer and -an Android-powered device. Applications could also use Wi-Fi Direct to stream +an Android-powered device. Applications could also use Wi-Fi P2P to stream media content from a peer device such as a digital television or audio player, connect a group of users for gaming, print files, and more.

diff --git a/docs/html/about/versions/android-4.0.jd b/docs/html/about/versions/android-4.0.jd index c026534..6c4ccb4 100644 --- a/docs/html/about/versions/android-4.0.jd +++ b/docs/html/about/versions/android-4.0.jd @@ -619,12 +619,14 @@ Beam Demo.

Wi-Fi P2P

-

Android now supports Wi-Fi peer-to-peer (P2P) connections between Android-powered -devices and other device types (in compliance with the Wi-Fi -Alliance's Wi-Fi Direct™ certification program) without a hotspot or Internet connection. The Android framework -provides a set of Wi-Fi P2P APIs that allow you to discover and connect to other devices when each -device supports Wi-Fi P2P, then communicate over a speedy connection across distances much longer -than a Bluetooth connection.

+

Android now supports Wi-Fi peer-to-peer (P2P) connections between Android-powered devices and +other device types (in compliance with the Wi-Fi Alliance's Wi-Fi Direct™ +certification program) without a hotspot or Internet connection. The Android framework provides a +set of Wi-Fi P2P APIs that allow you to discover and connect to other devices when each device +supports Wi-Fi P2P, then communicate over a speedy connection across distances much longer than a +Bluetooth connection.

+

A new package, {@link android.net.wifi.p2p}, contains all the APIs for performing peer-to-peer connections with Wi-Fi. The primary class you need to work with is {@link diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd index 5deb190..c7d1941 100644 --- a/docs/html/about/versions/jelly-bean.jd +++ b/docs/html/about/versions/jelly-bean.jd @@ -860,13 +860,13 @@ screenshots or on a non-secure display output, even when mirrored.

Wireless display

-

Starting in Android 4.2, users on supported devices can connect to an -external display over Wi-Fi, using Miracast, a -peer-to-peer wireless display standard created by the Wi-Fi Alliance. When a wireless display is -connected, users can stream any type of content to the big screen, including -photos, games, maps, and more.

+

Starting in Android 4.2, users on supported devices can connect to an external display over +Wi-Fi, using Wi-Fi Display (a peer-to-peer wireless display solution that complies with the +Miracast™ certification +program). When a wireless display is connected, users can stream any type of content to the big +screen, including photos, games, maps, and more.

+

Apps can take advantage of wireless displays in the same way as they do other external displays and no extra work is needed. The system manages the network @@ -1455,15 +1455,22 @@ style="font-weight:500;">App Widgets can resize automatically to fit the

You can take advantage of this API to build new features into your apps. For example, you could let users connect to a webcam, a printer, or an app on another mobile device that supports Wi-Fi peer-to-peer connections.

-

Wi-Fi Direct Service Discovery

+

Wi-Fi P2P Service Discovery

+ +

Ice Cream Sandwich introduced +support for Wi-Fi Peer-to-Peer (P2P), a technology that lets apps discover and pair +directly, over a high-bandwidth peer-to-peer connection (in compliance with the Wi-Fi +Alliance's Wi-Fi Direct™ +certification program). Wi-Fi P2P is an ideal way to share media, photos, files and other types of +data and sessions, even where there is no cell network or Wi-Fi available.

-

Ice Cream Sandwich introduced support for Wi-Fi Direct, a technology that lets apps discover and pair directly, over a high-bandwidth peer-to-peer connection. Wi-Fi Direct is an ideal way to share media, photos, files and other types of data and sessions, even where there is no cell network or Wi-Fi available.

-

Android 4.1 takes Wi-Fi Direct further, adding API support for pre-associated service discovery. Pre-associated service discovery lets your apps get more useful information from nearby devices about the services they support, before they attempt to connect. Apps can initiate discovery for a specific service and filter the list of discovered devices to those that actually support the target service or application.

+

Android 4.1 takes Wi-Fi P2P further, adding API support for pre-associated service discovery. Pre-associated service discovery lets your apps get more useful information from nearby devices about the services they support, before they attempt to connect. Apps can initiate discovery for a specific service and filter the list of discovered devices to those that actually support the target service or application.

-

For example, this means that your app could discover only devices that are “printers” or that have a specific game available, instead of discovering all nearby Wi-Fi Direct devices. On the other hand, your app can advertise the service it provides to other devices, which can discover it and then negotiate a connection. This greatly simplifies discovery and pairing for users and lets apps take advantage of Wi-Fi Direct more effectively.

+

For example, this means that your app could discover only devices that are “printers” or that have a specific game available, instead of discovering all nearby Wi-Fi P2P devices. On the other hand, your app can advertise the service it provides to other devices, which can discover it and then negotiate a connection. This greatly simplifies discovery and pairing for users and lets apps take advantage of Wi-Fi P2P more effectively.

-

With Wi-Fi Direct service discovery, you can create apps and multiplayer games that can share photos, videos, gameplay, scores, or almost anything else — all without requiring any Internet or mobile network. Your users can connect using only a direct p2p connection, which avoids using mobile bandwidth.

+

With Wi-Fi P2P service discovery, you can create apps and multiplayer games that can share photos, videos, gameplay, scores, or almost anything else — all without requiring any Internet or mobile network. Your users can connect using only a direct p2p connection, which avoids using mobile bandwidth.

Network Bandwidth Management

diff --git a/docs/html/guide/topics/connectivity/index.jd b/docs/html/guide/topics/connectivity/index.jd index 322518e..385cf08 100644 --- a/docs/html/guide/topics/connectivity/index.jd +++ b/docs/html/guide/topics/connectivity/index.jd @@ -1,6 +1,6 @@ page.title=Connectivity page.landing=true -page.landing.intro=Android provides rich APIs to let your app connect and interact with other devices over Bluetooth, NFC, Wi-Fi Direct, USB, and SIP, in addition to standard network connections. +page.landing.intro=Android provides rich APIs to let your app connect and interact with other devices over Bluetooth, NFC, Wi-Fi P2P, USB, and SIP, in addition to standard network connections. page.landing.image=images/develop/connectivity.png @jd:body diff --git a/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd b/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd index 8dc5fd9..5c1321e 100644 --- a/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd +++ b/docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd @@ -1,7 +1,4 @@ page.title=Using Wi-Fi P2P for Service Discovery -parent.title=Connecting Devices Wirelessly -parent.link=index.html - trainingnavtop=true @jd:body diff --git a/docs/html/training/connect-devices-wirelessly/nsd.jd b/docs/html/training/connect-devices-wirelessly/nsd.jd index 30f5c49..e07e2af 100644 --- a/docs/html/training/connect-devices-wirelessly/nsd.jd +++ b/docs/html/training/connect-devices-wirelessly/nsd.jd @@ -1,10 +1,6 @@ page.title=Using Network Service Discovery -parent.title=Connecting Devices Wirelessly -parent.link=index.html trainingnavtop=true -next.title=Connecting with Wi-Fi Direct -next.link=wifi-direct.html @jd:body diff --git a/docs/html/training/connect-devices-wirelessly/wifi-direct.jd b/docs/html/training/connect-devices-wirelessly/wifi-direct.jd index 98435c6..d67ed23 100644 --- a/docs/html/training/connect-devices-wirelessly/wifi-direct.jd +++ b/docs/html/training/connect-devices-wirelessly/wifi-direct.jd @@ -23,8 +23,10 @@ trainingnavtop=true

The Wi-Fi peer-to-peer (P2P) APIs allow applications to connect to nearby devices without -needing to connect to a network or hotspot (Android's Wi-Fi P2P framework complies with the Wi-Fi -Alliance's Wi-Fi Direct™ certification program). Wi-Fi P2P allows your application to quickly +needing to connect to a network or hotspot (Android's Wi-Fi P2P framework complies with the +Wi-Fi Direct™ certification program). + Wi-Fi P2P allows your application to quickly find and interact with nearby devices, at a range beyond the capabilities of Bluetooth.

diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index 0c4f9df..8c2752e 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -418,7 +418,7 @@ include the action bar on devices running Android 2.1 or higher."

  • - Using Wi-Fi Direct for Service Discovery + Using Wi-Fi P2P for Service Discovery
    • -- cgit v1.1