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

Commit 60c4e039 authored by Scott Main's avatar Scott Main
Browse files

cherrypick Change-Id: Id5d38a6d97323e082535e433ab64e89e8bd3d021 

docs: catchup honeycomb to gingerbread-docs with misc changes

Change-Id: Ia192e253a1b0aca026e1809b4e68011975c1ad8c
parent 7866b8a6

docs/html/guide/guide_toc.cs

+26 −43
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ 
      </li>

      <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">

            <span class="en">Device Administration</span>

         </a> <span class="new">new!</span>

         </a>

      </li>

      <li class="toggle-list">

           <div>
@@ -274,27 +274,22 @@ 
              <li>

                <a href="<?cs var:toroot?>guide/topics/testing/testing_android.html">

                <span class="en">Testing Fundamentals</span></a>

                <span class="new">new!</span>

              </li>

              <li>

                <a href="<?cs var:toroot?>guide/topics/testing/activity_testing.html">

                <span class="en">Activity Testing</span></a>

                <span class="new">new!</span>

              </li>

              <li>

                <a href="<?cs var:toroot?>guide/topics/testing/contentprovider_testing.html">

                <span class="en">Content Provider Testing</span></a>

                <span class="new">new!</span>

              </li>

              <li>

                <a href="<?cs var:toroot?>guide/topics/testing/service_testing.html">

                <span class="en">Service Testing</span></a>

                <span class="new">new!</span>

              </li>

              <li>

                <a href="<?cs var:toroot ?>guide/topics/testing/what_to_test.html">

                <span class="en">What To Test</span></a>

                <span class="new">new!</span>

              </li>



           </ul>
@@ -468,34 +463,22 @@ 
          <li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li>

          <li><a href="/guide/developing/tools/monkey.html">Monkey</a></li>

          <li class="toggle-list">

                 <div> 

                     <a href="/guide/developing/tools/monkeyrunner_concepts.html"> 

            <div><a href="/guide/developing/tools/monkeyrunner_concepts.html">

              <span class="en">monkeyrunner</span>

                  </a> 

                      <span class="new">new!</span> 

                  </div> 

            </a></div>

            <ul>

                      <li> 

                          <a href="/guide/developing/tools/MonkeyDevice.html"> 

              <li><a href="/guide/developing/tools/MonkeyDevice.html">

                <span class="en">MonkeyDevice</span>

                        </a> 

                        <span class="new">new!</span> 

                    </li> 

                    <li> 

                        <a href="/guide/developing/tools/MonkeyImage.html"> 

                </a></li>

              <li><a href="/guide/developing/tools/MonkeyImage.html">

                <span class="en">MonkeyImage</span>

                        </a> 

                        <span class="new">new!</span> 

                    </li> 

                    <li> 

                        <a href="/guide/developing/tools/MonkeyRunner.html"> 

                </a></li>

              <li><a href="/guide/developing/tools/MonkeyRunner.html">

                <span class="en">MonkeyRunner</span>

                        </a> 

                        <span class="new">new!</span> 

                    </li> 

                </a></li>

            </ul>

          </li>

              <li><a href="/guide/developing/tools/proguard.html">ProGuard</a> <span class="new">new!</span></li> 

          <li><a href="/guide/developing/tools/proguard.html">ProGuard</a></li>

          <li><a href="/guide/developing/tools/adb.html#sqlite">sqlite3</a></li>

          <li><a href="<?cs var:toroot ?>guide/developing/tools/zipalign.html">zipalign</a></li>

        </ul>
@@ -536,7 +519,7 @@ 
          </a></li>

      <li><a href="<?cs var:toroot ?>guide/publishing/licensing.html">

            <span class="en">Licensing Your Applications</span>

          </a> <span class="new">new!</span></li>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/publishing/preparing.html">

            <span class="en">Preparing to Publish</span>

            <span class="de" style="display:none">Vorbereitung auf die Veröffentlichung</span>
@@ -631,19 +614,19 @@ 
    <ul>

      <li><a href="<?cs var:toroot ?>guide/webapps/index.html">

            <span class="en">Web Apps Overview</span>

          </a> <span class="new">new!</span><!-- 11/1/10 --></li>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/webapps/targeting.html">

            <span class="en">Targeting Screens from Web Apps</span>

          </a> <span class="new">new!</span><!-- 11/1/10 --></li>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/webapps/webview.html">

            <span class="en">Building Web Apps in WebView</span>

          </a> <span class="new">new!</span><!-- 11/1/10 --></li>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/webapps/debugging.html">

            <span class="en">Debugging Web Apps</span>

          </a> <span class="new">new!</span><!-- 11/1/10 --></li>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/webapps/best-practices.html">

            <span class="en">Best Practices for Web Apps</span>

          </a> <span class="new">new!</span><!-- 11/1/10 --></li>

          </a></li>

    </ul>

  </li>

docs/html/resources/resources_toc.cs

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ 
?>



  <li>

   <h2><span class="en">More</span>

    </h2>

   <h2><span class="en">More</span></h2>

    <ul>

      <li><a href="<?cs var:toroot ?>resources/faq/commontasks.html">

            <span class="en">Common Tasks </span>

docs/html/resources/samples/index.jd

+7 −0
Original line number Diff line number Diff line
@@ -18,6 +18,13 @@ href="{@docRoot}resources/samples/get.html">Getting the Samples</a>.</p> 
-->

<dl>



 <dt><a href="AccelerometerPlay/index.html">Accelerometer Play</a></dt>

  <dd>An example that demonstrates how to use accelerometer readings

  in an application.</dd>

  

 <dt><a href="AccessibilityService/index.html">Accessibility Service</a></dt>

  <dd>An example that demonstrates the use of accessibility APIs.</dd>



 <dt><a href="ApiDemos/index.html">API Demos</a></dt>

  <dd>A variety of small applications that demonstrate an extensive collection of

  framework topics.</dd>

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

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ protected boolean onTap(int index) { 
  OverlayItem item = mOverlays.get(index);

  AlertDialog.Builder dialog = new AlertDialog.Builder(mContext);

  dialog.setTitle(item.getTitle());

  dialog.setMessage(item.getSnippet())

  dialog.setMessage(item.getSnippet());

  dialog.show();

  return true;

}

docs/html/sdk/android-2.3-highlights.jd

+8 −7
Original line number Diff line number Diff line
@@ -40,18 +40,18 @@ page.title=Android 2.3 Platform Highlights 


<div class="video">

<object width="278" height="180">

<param name="movie" value="http://www.youtube.com/v/yAZYSVr2Bhc&hl=en&fs=1&"></param>

<param name="movie" value="http://www.youtube.com/v/Jx3pdWBlZ34?hl=en&fs=1"></param>

<param name="allowFullScreen" value="true"></param><param name="allowscriptaccess"

value="always"></param>

<embed src="http://www.youtube.com/v/yAZYSVr2Bhc&hl=en&fs=1&" type="application/x-shockwave-flash"

<embed src="http://www.youtube.com/v/Jx3pdWBlZ34?hl=en&fs=1" type="application/x-shockwave-flash"

allowscriptaccess="always" allowfullscreen="true" width="278" height="180"></embed>

</object>

</div>



<p>The Android 2.3 platform introduces many new and exciting features for

users and developers. This document provides a glimpse at some of the new user features

users and developers. This document provides a glimpse at some of the new features

and technologies in Android 2.3. For detailed information about the new developer APIs, see the <a

href="android-2.3.html#api">Android 2.3 version notes</a>.</p>

href="android-2.3.html">Android 2.3 version notes</a>.</p>



<ul>

  <li><a href="#UserFeatures">New User Features</a></li>
@@ -251,7 +251,8 @@ application could use readings from a gyroscope and accelerometer on the device 
to recognize complex user gestures and motions, such as tilt, spin, thrust, and

slice.  </p>



<p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Low-latency native



<p style="margin-top:1.25em;margin-bottom:.75em;"><strong>Open API for native

audio</strong></p>



<p>The platform provides a software implementation of <a
@@ -405,7 +406,7 @@ open container format</li> 
<ul>

<li>Dalvik VM:

<ul>

<li>Concurrent Garbage Collector (target sub-3ms pauses)</li>

<li>Concurrent garbage collector (target sub-3ms pauses)</li>

<li>Adds further JIT (code-generation) optimizations</li>

<li>Improved code verification</li>

<li>StrictMode debugging, for identifying performance and memory issues</li>
@@ -438,5 +439,5 @@ open container format</li> 
</ul>



<p>For more information about the new developer APIs, see the <a

href="android-2.3.html#api">Android 2.3 version notes</a> and the <a

href="android-2.3.html">Android 2.3 version notes</a> and the <a

href="{@docRoot}sdk/api_diff/9/changes.html">API Differences Report</a>.</p>