PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 192b71ac: am 5f765f7c: Fix to bug 3389385.

Browse Source 
* commit '192b71ac792932939d7d23cee1f04e30105cf75d':
  Fix to bug 3389385.
This commit is contained in:
Roy West
2011-01-26 12:47:57 -08:00
committed by Android Git Automerger
parent b13e56b8dd 192b71ac79
commit 5f1900ce54
4 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
assets/html/en_us/tethering_bluetooth_help.html Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<html>
<head>
<style>
P {
font-size: 14 px;
}
B {
font-size: 16px;
}
A {
color: #OOC;
}
.style1 {
font-size: 16px;
}
</style>
</head>
<body>
<p><b>Bluetooth tethering</b></p>
<span class="style1">You can tether your Android device to your computer via a Bluetooth connection, to share your device's Internet connection with your computer</span>
<ul>
<li>Bluetooth tethering works with any computer or other device that can obtain an Internet connection via Bluetooth</li><br>
<li>For more information, see <a href="http://www.android.com/tether#bluetooth">http://www.android.com/tether#bluetooth</a></li><br>
</ul>
</body>
</html>

20
assets/html/en_us/tethering_help.html
View File

@@ -18,16 +18,24 @@ A {
</head> </head>
<body> <body>
<p><b>USB tethering</b></p> <p><b>USB tethering</b></p>
<span class="style1">You can tether your phone to your computer with a USB cable, to share your phone's internet connection with your computer</span> <span class="style1">You can tether your Android device to your computer with a USB cable, to share your device's Internet connection with your computer</span>
<ul> <ul>
<li>Tethering works with Windows Vista, Windows 7, and Linux</li><br> <li>USB tethering works with Windows Vista, Windows 7, and Linux</li><br>
<li>You can't mount your phone's SD card on your computer when USB tethered</li><br> <li>If your device has an SD card or USB storage, you can't mount it on your computer when USB tethered</li><br>
<li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br> <li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
</ul> </ul>
<p><b>Portable Wi-Fi hotspot</b></p>
<span class="style1">You can turn your phone into a portable Wi-Fi hotspot, to share your phone's internet connection with one or more computers or other devices</span> <p><b>Bluetooth tethering</b></p>
<span class="style1">You can tether your Android device to your computer via a Bluetooth connection, to share your device's Internet connection with your computer</span>
<ul> <ul>
<li>When your phone is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the internet via its Wi-Fi connection</li><br> <li>Bluetooth tethering works with any computer or other device that can obtain an Internet connection via Bluetooth</li><br>
<li>For more information, see <a href="http://www.android.com/tether#bluetooth">http://www.android.com/tether#bluetooth</a></li><br>
</ul>
<p><b>Portable Wi-Fi hotspot</b></p>
<span class="style1">You can turn your Android device into a portable Wi-Fi hotspot, to share your Android device's Internet connection with one or more computers or other devices</span>
<ul>
<li>When your device is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the Internet via its Wi-Fi connection (but of course you remain connected to the Internet via your mobile data network)</li><br>
<li>You configure the hotspot with the Wi-Fi hotspot settings</li><br> <li>You configure the hotspot with the Wi-Fi hotspot settings</li><br>
<li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br> <li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
</ul> </ul>

6
assets/html/en_us/tethering_usb_help.html
View File

@@ -18,10 +18,10 @@ A {
</head> </head>
<body> <body>
<p><b>USB tethering</b></p> <p><b>USB tethering</b></p>
<span class="style1">You can tether your phone to your computer with a USB cable, to share your phone's internet connection with your computer</span> <span class="style1">You can tether your Android device to your computer with a USB cable, to share your device's Internet connection with your computer</span>
<ul> <ul>
<li>Tethering works with Windows Vista, Windows 7, and Linux</li><br> <li>USB tethering works with Windows Vista, Windows 7, and Linux</li><br>
<li>You can't mount your phone's SD card on your computer when USB tethered</li><br> <li>If your device has an SD card or USB storage, you can't mount it on your computer when USB tethered</li><br>
<li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br> <li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
</ul> </ul>
</body> </body>

4
assets/html/en_us/tethering_wifi_help.html
View File

@@ -18,9 +18,9 @@ A {
</head> </head>
<body> <body>
<p><b>Portable Wi-Fi hotspot</b></p> <p><b>Portable Wi-Fi hotspot</b></p>
<span class="style1">You can turn your phone into a portable Wi-Fi hotspot, to share your phone's internet connection with one or more computers or other devices</span> <span class="style1">You can turn your Android device into a portable Wi-Fi hotspot, to share your Android device's Internet connection with one or more computers or other devices</span>
<ul> <ul>
<li>When your phone is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the internet via its Wi-Fi connection</li><br> <li>When your device is serving as a Wi-Fi hotspot, you can't use your phone's applications to access the Internet via its Wi-Fi connection (but of course you remain connected to the Internet via your mobile data network)</li><br>
<li>You configure the hotspot with the Wi-Fi hotspot settings</li><br> <li>You configure the hotspot with the Wi-Fi hotspot settings</li><br>
<li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br> <li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
</ul> </ul>