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

Commit 9352bfa0 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by The Android Open Source Project
Browse files

am 4f508936: am 392d29ab: AI 148193: More misc fixes in format, links, con 

Merge commit '4f508936'

* commit '4f508936':
  AI 148193: More misc fixes in format, links, content for Android 1.5 SDK docs.
parents e90c0da6 4f508936

docs/html/guide/developing/tools/traceview.jd

+27 −18
Original line number Diff line number Diff line 
page.title=Traceview: A Graphical Log Viewer

@jd:body



<p>Traceview is a graphical viewer for execution logs

saved by your application. The sections below describe how to use the program. </p>

<div id="qv-wrapper">

<div id="qv">



<h2>Contents</h2>

  <h2>In this document</h2>

<ol>

    <li><a href="#creatingtracefiles">Creating Trace Files</a></li>

    <li><a href="#copyingfiles">Copying Trace Files to a Host Machine</a></li>

    <li><a href="#runningtraceview">Viewing Trace Files in Traceview</a>

            <ol>

		<li><a href="#timelinepanel">Timeline Panel</a></li>

        	<li><a href="#profilepanel">Profile Panel</a></li>

	    </ol></li>

    <li><a href="#format">Traceview File Format</a>

            <ol>

		<li><a href="#datafileformat">Data File Format</a></li>

        	<li><a href="#keyfileformat">Key File Format</a></li>

	    </ol></li>

    <li><a href="#knownissues">Traceview Known Issues</a></li>

    <li><a href="#dmtracedump">Using dmtracedump</a></li>

</ol>

</div>

</div>



<dl>

    <dt><a href="#creatingtracefiles">Creating Trace Files</a></dt>

    <dt><a href="#copyingfiles">Copying Trace Files to a Host Machine</a></dt>

    <dt><a href="#runningtraceview">Viewing Trace Files in Traceview</a></dt>

            <dd><a href="#timelinepanel">Timeline Panel</a></dd>

        	<dd><a href="#profilepanel">Profile Panel</a></dd>

    <dt><a href="#format">Traceview File Format</a></dd>

        	<dd><a href="#datafileformat">Data File Format</a><dd>

        	<dd><a href="#keyfileformat">Key File Format</a></dd>

	<dt><a href="#knownissues">Traceview Known Issues</a></dd>

    <dt><a href="#dmtracedump">Using dmtracedump</a></dt>

</dl>

<p>Traceview is a graphical viewer for execution logs

saved by your application. Traceview can help you debug your application and 

profile its performance. The sections below describe how to use the program. </p>



<a name="creatingtracefiles"></a>
@@ -63,10 +72,10 @@ have made the code faster or slower. </p> 


<p>When using the Android emulator, you must create an SD card image upon which

the trace files will be written. For example, from the <code>/tools</code> directory, you 

can create an SD card image and mount it when launching the emulator like so:</p>

can create an SD card image named "imgcd" and mount it when launching the emulator like so:</p>

<pre>

<b>$</b> mksdcard 1024M ./imgcd

<b>$</b> emulator -sdcard ./img

<b>$</b> emulator -sdcard ./imgcd

</pre>

<p>For more information, read about the 

<a href="{@docRoot}guide/developing/tools/othertools.html#mksdcard">mksdcard tool</a>.</p>

docs/html/guide/samples/index.jd

+5 −3
Original line number Diff line number Diff line
@@ -4,11 +4,13 @@ page.title=Sample Code 




<p>Sometimes, the best way to learn how things are done is to just look at some code. So here

 we've provided links to let you browse the source of some some simple Android applications. </p>

 we've provided links to let you browse the source of some sample Android applications included

in the Android SDK. </p>



<p>The source code for these applications is included in the Android SDK, in this location:</p>

<p>The SDK includes a full set of sample applications for each Android platform version 

in the SDK. You can find the sample applications for each platform version in this location:</p>



<p style="margin-left:2em"><code>&lt;sdk&gt;/samples/</code></p>

<p style="margin-left:2em"><code>&lt;sdk&gt;/platforms/android-&lt;version&gt;/samples/</code></p>



<p>You can easily add these applications as projects in your development environment, so that you 

can modify them and watch them execute. </p>

docs/html/guide/topics/location/index.jd

+5 −6
Original line number Diff line number Diff line
@@ -116,12 +116,11 @@ that lets your application manipulate Google Maps data through class methods, 
and it lets you work with Maps data as you would other types of Views.</p>



<p>The Maps external library is not part of the standard Android library, so it

may not be present on some compliant Android-powered devices (although it is

likely to be present on most devices). Similarly, the Maps external library is

not included in the standard Android library provided in the SDK. So that you

can develop using the classes of the com.google.android.maps package, the Maps

external library is made available to you as part of the Google APIs add-on for

the Android SDK. </p>

may not be present on some compliant Android-powered devices. Similarly, the

Maps external library is not included in the standard Android library provided

in the SDK. So that you can develop using the classes of the

com.google.android.maps package, the Maps external library is made available to

you as part of the Google APIs add-on for the Android SDK. </p>



<p>To learn more about the Maps external library and how to download and use the

Google APIs add-on, visit</p>

docs/html/guide/tutorials/views/hello-mapview.jd

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ First, we'll create a simple Activity that can view and navigate a map. Then we 
      certificate has been registered with the Google Maps service. Because MapView uses Google Maps data, this key is required

      in order to receive the map data, even while you are developing. Registration is free and it only takes a couple

      minutes to register your certificate and receive a Maps API Key. For instructions on getting a key, read

      <a href="{@docRoot}guide/topics/location/geo/mapkey.html">Obtaining a Maps API Key</a>.

      <a href="http://code.google.com/android/add-ons/google-apis/mapkey.html">Obtaining a Maps API Key</a>.

      (For the purpose of this tutorial, you should register with the fingerprint of the SDK debug certificate.)

      Once you've acquired the Maps API Key, insert it for the <code>apiKey</code> value.</p></li>

docs/html/sdk/api_diff/3/changes.html

+6 −9
Original line number Diff line number Diff line
@@ -25,16 +25,13 @@ body{overflow:auto;} 
<style type="text/css">

body{background-image:url();padding:12px;}

</style>

<style type="text/css">

frame {border:10px solid green;}

</style

</HEAD>

<FRAMESET COLS="242,**" frameborder="1" border="7" xframespacing="20" bordercolor="#e9e9e9"> 

<frameset rows="164,**" frameborder="1" border="7" xframespacing="20" resizable="yes">

    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe" xframeborder="1" xborder="6" xframespacing="0">

    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe" xframeborder="1" xborder="1" xframespacing="0">

</head>

<FRAMESET COLS="242,**" frameborder="1" border="7" bordercolor="#e9e9e9"> 

<frameset rows="164,**" frameborder="1" border="7" resizable="yes">

    <FRAME SRC="changes/jdiff_topleftframe.html" SCROLLING="no" NAME="topleftframe">

    <FRAME SRC="changes/alldiffs_index_all.html" SCROLLING="auto" NAME="bottomleftframe">

  </FRAMESET>

  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe" xframeborder="1" xborder="1" xframespacing="0">

  <FRAME SRC="changes/changes-summary.html" SCROLLING="auto" NAME="rightframe">

</FRAMESET>

<NOFRAMES>

<H2>