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

am c411b4ec: Merge "docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758" into honeycomb

Browse Source 
* commit 'c411b4ec343406a34db6f53e8a0f7ee9aa417c0d':
  docs: fix misc doc bugs bug: 3295540 bug: 3319686 bug: 3337541 bug: 3355640 bug: 3483758
This commit is contained in:
Scott Main
2011-03-10 15:40:32 -08:00
committed by Android Git Automerger
parent dd7617b327 c411b4ec34
commit dc8b70cabc
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/html/guide/developing/device.jd
View File

@@ -119,7 +119,7 @@ USB device support on Linux. The USB Vendor ID is the value given to the
<table> <table>
<tr> <tr>
<th>Manufacturer</th><th>USB Vendor ID</th></tr> <th>Company</th><th>USB Vendor ID</th></tr>
<tr> <tr>
<td>Acer</td> <td>Acer</td>
<td><code>0502</code></td></tr> <td><code>0502</code></td></tr>
@@ -132,6 +132,9 @@ USB device support on Linux. The USB Vendor ID is the value given to the
<tr> <tr>
<td>Garmin-Asus</td> <td>Garmin-Asus</td>
<td><code>091E</code></td></tr> <td><code>091E</code></td></tr>
<tr>
<td>Google</td>
<td><code>18d1</code></td></tr>
<tr> <tr>
<td>HTC</td> <td>HTC</td>
<td><code>0bb4</code></td></tr> <td><code>0bb4</code></td></tr>

4
docs/html/guide/publishing/app-signing.jd
View File

@@ -260,8 +260,8 @@ looks like this:</p>
<p>To fix this problem, simply delete the <code>debug.keystore</code> file. <p>To fix this problem, simply delete the <code>debug.keystore</code> file.
The default storage location for AVDs is in <code>~/.android/</code> on OS X and Linux, The default storage location for AVDs is in <code>~/.android/</code> on OS X and Linux,
in <code>C:\Documents and Settings\<user>\.android\</code> on Windows XP, and in in <code>C:\Documents and Settings\&lt;user>\.android\</code> on Windows XP, and in
<code>C:\Users\<user>\.android\</code> on Windows Vista.</p> <code>C:\Users\&lt;user>\.android\</code> on Windows Vista and Windows 7.</p>
<p>The next time you build, the build tools will regenerate a new keystore and debug key.</p> <p>The next time you build, the build tools will regenerate a new keystore and debug key.</p>

2
docs/html/guide/topics/resources/menu-resource.jd
View File

@@ -250,7 +250,7 @@ on the data that is currently displayed.</td></tr>
android:icon="@drawable/group_item1_icon" /> android:icon="@drawable/group_item1_icon" />
&lt;item android:id="@+id/group_item2" &lt;item android:id="@+id/group_item2"
android:onClick="onGroupItemClick" android:onClick="onGroupItemClick"
android:title="G@string/group_item2" android:title="@string/group_item2"
android:icon="@drawable/group_item2_icon" /> android:icon="@drawable/group_item2_icon" />
&lt;/group> &lt;/group>
&lt;item android:id="@+id/submenu" &lt;item android:id="@+id/submenu"

4
docs/html/guide/topics/wireless/bluetooth.jd
View File

@@ -554,7 +554,7 @@ private class AcceptThread extends Thread {
BluetoothServerSocket tmp = null; BluetoothServerSocket tmp = null;
try { try {
// MY_UUID is the app's UUID string, also used by the client code // MY_UUID is the app's UUID string, also used by the client code
tmp = mAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID); tmp = mBluetoothAdapter.listenUsingRfcommWithServiceRecord(NAME, MY_UUID);
} catch (IOException e) { } } catch (IOException e) { }
mmServerSocket = tmp; mmServerSocket = tmp;
} }
@@ -690,7 +690,7 @@ private class ConnectThread extends Thread {
public void run() { public void run() {
// Cancel discovery because it will slow down the connection // Cancel discovery because it will slow down the connection
mAdapter.cancelDiscovery(); mBluetoothAdapter.cancelDiscovery();
try { try {
// Connect the device through the socket. This will block // Connect the device through the socket. This will block

2
docs/html/resources/tutorials/hello-world.jd
View File

@@ -433,7 +433,7 @@ The entire file should now look like this:
</pre> </pre>
</li> </li>
<li>Now open and modify your <code>HelloAndroid</code> class use the <li>Now open and modify your <code>HelloAndroid</code> class and use the
XML layout. Edit the file to look like this: XML layout. Edit the file to look like this:
<pre> <pre>
package com.example.helloandroid; package com.example.helloandroid;