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

am c7c7afd7: Doc change: Fix incorrect adt version reference etc.

Browse Source 
Merge commit 'c7c7afd7a1af36e787266815487f4600196406b8' into froyo-plus-aosp

* commit 'c7c7afd7a1af36e787266815487f4600196406b8':
  Doc change: Fix incorrect adt version reference etc.
This commit is contained in:
Dirk Dougherty
2010-05-24 09:56:47 -07:00
committed by Android Git Automerger
parent 3c16154a33 c7c7afd7a1
commit 3cffe1abab
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/html/index.jd
View File

@@ -14,9 +14,8 @@ home=true
<img src="{@docRoot}images/home/io-logo.png" alt="Google IO <img src="{@docRoot}images/home/io-logo.png" alt="Google IO
2010" width="200" height="41" style="padding:22px 12px;"/> 2010" width="200" height="41" style="padding:22px 12px;"/>
<div id="announcement" style="width:295px"> <div id="announcement" style="width:295px">
<p>Google I/O is happening now! To those of you with us, welcome! If you couldn't make it to the <p>Thanks to everyone who visited us at Google I/O in San Francisco! Stay tuned for
event, stay tuned for videos and slides from the Android sessions, which will be posted at the videos and slides from the Android sessions, which will be posted at the Google I/O web site.</p><p><a
Google I/O web site.</p><p><a
href="http://code.google.com/events/io/2010/sessions.html#Android">Learn more &raquo;</a></p> href="http://code.google.com/events/io/2010/sessions.html#Android">Learn more &raquo;</a></p>
</div> <!-- end annoucement --> </div> <!-- end annoucement -->
</div> <!-- end annoucement-block --> </div> <!-- end annoucement-block -->

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

@@ -299,7 +299,7 @@ programmatically-constructed example:</p>
<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt; <pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
&lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; &lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
android:id=&quot;@id+/textview&quot; android:id=&quot;@+id/textview&quot;
android:layout_width=&quot;fill_parent&quot; android:layout_width=&quot;fill_parent&quot;
android:layout_height=&quot;fill_parent&quot; android:layout_height=&quot;fill_parent&quot;
android:text=&quot;@string/hello&quot;/&gt;</pre> android:text=&quot;@string/hello&quot;/&gt;</pre>
@@ -410,7 +410,7 @@ the following XML:
<pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt; <pre>&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-8&quot;?&gt;
&lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot; &lt;TextView xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;
android:id=&quot;@id+/textview&quot; android:id=&quot;@+id/textview&quot;
android:layout_width=&quot;fill_parent&quot; android:layout_width=&quot;fill_parent&quot;
android:layout_height=&quot;fill_parent&quot; android:layout_height=&quot;fill_parent&quot;
android:text=&quot;@string/hello&quot;/&gt;</pre> android:text=&quot;@string/hello&quot;/&gt;</pre>

2
docs/html/sdk/eclipse-adt.jd
View File

@@ -95,7 +95,7 @@ padding: .25em 1em;
<div class="toggleable opened"> <div class="toggleable opened">
<a href="#" onclick="return toggleDiv(this)"> <a href="#" onclick="return toggleDiv(this)">
<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" /> <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" />
ADT 0.9.6</a> <em>(March 2010)</em> ADT 0.9.7</a> <em>(May 2010)</em>
<div class="toggleme"> <div class="toggleme">
<dl> <dl>