Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d764b01 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 1586f713: am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect... 

am 1586f713: am b59fbafe: am 3cffe1ab: am c7c7afd7: Doc change: Fix incorrect adt version reference etc.
parents c21c1900 1586f713

docs/html/index.jd

+2 −3
Original line number Original line Diff line number Diff line
@@ -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 -->

docs/html/resources/tutorials/hello-world.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -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>

docs/html/sdk/eclipse-adt.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>