Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 48c6b573: Merge "more string changes for wi-fi trademark compliance" into jb-mr2-docs

Browse Source 
* commit '48c6b5735ef6a8f6afe92ed7c34d848d1f7754a3':
  more string changes for wi-fi trademark compliance
This commit is contained in:
James Kelly
2013-09-18 18:04:45 -07:00
committed by Android Git Automerger
parent fe790af589 48c6b5735e
commit 2815bb05a0
9 changed files with 54 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/html/about/index.jd
View File

@@ -53,7 +53,7 @@ differentiated applications.</p>
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.</p> -->
Communication (NFC), Wi-Fi P2P, and face tracking.</p> -->
<h3>Powerful development framework</h3>

34
docs/html/about/versions/android-4.0-highlights.jd
View File

@@ -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. </p>
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Wi-Fi Direct and Bluetooth HDP</strong></p>
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Wi-Fi P2P and Bluetooth HDP</strong></p>
<p>Support for <strong>Wi-Fi peer-to-peer (P2P)</strong> 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 <a href="http://www.wi-fi.org/discover-and-learn/wi-fi-direct"
class="external-link">Wi-Fi Direct&trade;</a>
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.</p>
<p>Support for <strong>Wi-Fi Direct</strong> 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.</p>
<p>Android 4.0 also introduces built-in support for connecting to <strong>Bluetooth Health Device Profile (HDP)</strong> devices. With support from third-party apps, users can connect to wireless medical devices and sensors in hospitals, fitness centers, homes, and elsewhere.</p>
@@ -868,16 +871,19 @@ VP8 content.</p>
<h3 id="connectivity-dev">New types of connectivity</h3>
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Wi-Fi Direct</strong></p>
<p style="margin-top:1em;margin-bottom:.75em;"><strong>Wi-Fi P2P</strong></p>
<p>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.</p>
<p>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 <a href=
"http://www.wi-fi.org/discover-and-learn/wi-fi-direct" class="external-link">Wi-Fi Direct&trade;</a>
certification program.</p>
<p>Wi-Fi Direct opens new opportunities for developers to add innovative
features to their applications. Applications can use Wi-Fi Direct to share
<p>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.</p>

14
docs/html/about/versions/android-4.0.jd
View File

@@ -619,12 +619,14 @@ Beam Demo</a>.</p>
<h3 id="WiFiDirect">Wi-Fi P2P</h3>
<p>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&trade; 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.</p>
<p>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 <a href=
"http://www.wi-fi.org/discover-and-learn/wi-fi-direct" class="external-link">Wi-Fi Direct&trade;</a>
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.</p>
<p>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

31
docs/html/about/versions/jelly-bean.jd
View File

@@ -860,13 +860,13 @@ screenshots or on a non-secure display output, even when mirrored.</p>
<h3 id="42-wireless-display">Wireless display</h3>
<p>Starting in Android 4.2, users on supported devices can connect to an
external display over Wi-Fi, using <a
href="http://www.wi-fi.org/wi-fi-certified-miracast%E2%84%A2">Miracast</a>, a
peer-to-peer wireless display standard created by the <a
href="http://www.wi-fi.org/">Wi-Fi Alliance</a>. When a wireless display is
connected, users can stream any type of content to the big screen, including
photos, games, maps, and more.</p>
<p>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
<a href="http://www.wi-fi.org/wi-fi-certified-miracast%E2%84%A2"
class="external-link">Miracast&trade;</a> 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.</p>
<p>Apps can take advantage of <strong>wireless displays</strong> 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</span> can resize automatically to fit the
<p>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. </p>
<h3>Wi-Fi Direct Service Discovery</h3>
<h3>Wi-Fi P2P Service Discovery</h3>
<p>Ice Cream Sandwich introduced support for Wi-Fi Direct, a technology that lets apps <strong>discover and pair directly</strong>, 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.</p>
<p><a href="{@docRoot}about/versions/android-4.0-highlights.html">Ice Cream Sandwich</a> introduced
support for Wi-Fi Peer-to-Peer (P2P), a technology that lets apps <strong>discover and pair
directly</strong>, over a high-bandwidth peer-to-peer connection (in compliance with the Wi-Fi
Alliance's <a href="http://www.wi-fi.org/discover-and-learn/wi-fi-direct"
class="external-link">Wi-Fi Direct&trade;</a>
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.</p>
<p>Android 4.1 takes Wi-Fi Direct further, adding API support for <strong>pre-associated service discovery</strong>. 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.</p>
<p>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.</p>
<p>Android 4.1 takes Wi-Fi P2P further, adding API support for <strong>pre-associated service discovery</strong>. 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.</p>
<p>With Wi-Fi Direct service discovery, you can create apps and <strong>multiplayer games</strong> that can share photos, videos, gameplay, scores, or almost anything else &mdash; all without requiring any Internet or mobile network. Your users can connect using only a direct p2p connection, which avoids using mobile bandwidth.</p>
<p>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.</p>
<p>With Wi-Fi P2P service discovery, you can create apps and <strong>multiplayer games</strong> that can share photos, videos, gameplay, scores, or almost anything else &mdash; all without requiring any Internet or mobile network. Your users can connect using only a direct p2p connection, which avoids using mobile bandwidth.</p>
<h3>Network Bandwidth Management</h3>

2
docs/html/guide/topics/connectivity/index.jd
View File

@@ -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

3
docs/html/training/connect-devices-wirelessly/nsd-wifi-direct.jd
View File

@@ -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

4
docs/html/training/connect-devices-wirelessly/nsd.jd
View File

@@ -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

6
docs/html/training/connect-devices-wirelessly/wifi-direct.jd
View File

@@ -23,8 +23,10 @@ trainingnavtop=true
</div>
<p>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&trade; 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
<a href="http://www.wi-fi.org/discover-and-learn/wi-fi-direct"
class="external-link">Wi-Fi Direct&trade;</a> certification program).
Wi-Fi P2P allows your application to quickly
find and interact with nearby devices, at a range beyond the capabilities of Bluetooth.
</p>
<p>

2
docs/html/training/training_toc.cs
View File

@@ -418,7 +418,7 @@ include the action bar on devices running Android 2.1 or higher."
</a>
</li>
<li><a href="<?cs var:toroot ?>training/connect-devices-wirelessly/nsd-wifi-direct.html">
Using Wi-Fi Direct for Service Discovery
Using Wi-Fi P2P for Service Discovery
</a>
</li>
</ul>