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

Commit 04c2a557 authored by Ricardo Cervera's avatar Ricardo Cervera Committed by Android Git Automerger
Browse files

am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes to use the... 

am c013eaad: am 5a218b18: am 8e183798: Merge "docs: Added notes to use the last SDK version to the Build your First App class." into klp-docs

* commit 'c013eaad':
  docs: Added notes to use the last SDK version to the Build your First App class.
parents 4a812147 c013eaad

docs/html/training/basics/firstapp/creating-project.jd

+12 −12
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ SDK tools from a command line.</p> 


<p class="note"><strong>Note:</strong> You should already have the Android SDK installed, and if

you're using Eclipse, you should also have the <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT

plugin</a> installed (version 21.0.0 or higher). If you don't have these, follow the guide to <a

plugin</a> installed (version 22.6.2 or higher). If you don't have these, follow the guide to <a

href="{@docRoot}sdk/installing/index.html">Installing the Android SDK</a> before you start this

lesson.</p>

docs/html/training/basics/firstapp/index.jd

+14 −10
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ next.link=creating-project.html 


<ul>

  <li><a href="http://developer.android.com/sdk/index.html">Android SDK</a></li>

  <li><a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> 20.0.0 or higher

  <li><a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> 22.6.2 or higher

    (if you're using Eclipse)</li>

</ul>
@@ -36,6 +36,10 @@ to:</p> 
  <li>Download the latest SDK tools and platforms using the SDK Manager.</li>

</ol>



<p class="note"><strong>Note:</strong> Make sure you install the most recent versions of the ADT

plugin and the Android SDK before you start this class. The procedures described in this class may

not apply to earlier versions.</p>



<p>If you haven't already done these tasks, start by downloading the

  <a href="{@docRoot}sdk/index.html">Android SDK</a> and following the install steps.

  Once you've finished the setup, you're ready to begin this class.</p>

docs/html/training/basics/firstapp/starting-activity.jd

+16 −12
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ activity.</li> 
information on fragments, see the <a href="{@docRoot}guide/components/fragments.html">Fragments

API Guide</a>. The final version of this activity does not use fragments.</p>



<p class="note"><strong>Note:</strong> Your activity may look different if you did not use

the latest version of the ADT plugin. Make sure you install the latest version of the

<a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT plugin</a> to complete this tutorial.</p>



<p>The {@code DisplayMessageActivity} class should now look like this:</p>



<pre>