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

Commit 8b166b47 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am b1ddc7ec: resolved conflicts for merge of 9bf45a00 to honeycomb-plus-aosp 

* commit 'b1ddc7ec':
  Finish the app fundamentals rewrite by updating the side nav and resolving links in the dev guide Also move the app fundamentals document back to fundamentals.jd TODO: resolve links in the javadocs
parents 5d386a1a b1ddc7ec

docs/html/guide/appendix/faq/commontasks.jd

+8 −6
Original line number Diff line number Diff line
@@ -124,8 +124,9 @@ It is not necessary to put external JARs in the assets folder. 
<h2>Implementing Activity Callbacks</h2>

<p>Android calls a number of callbacks to let you draw your screen, store data before

    pausing, and refresh data after closing. You must implement at least some of

    these methods. See <a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a>

    discussion in Application Fundamentals to learn when and in what order these methods 

    these methods. See the <a

href="{@docRoot}guide/topics/fundamentals/activites.html#Lifecycle">Activities</a>

    document to learn when and in what order these methods 

    are called. Here are some of the standard types of screen classes that Android provides:</p>

<ul>

    <li>{@link android.app.Activity android.app.Activity} - This is a standard screen,
@@ -150,9 +151,9 @@ It is not necessary to put external JARs in the assets folder. 
<p>When you open a new screen you can decide whether to make it transparent or floating,

    or full-screen. The choice of new screen affects the event sequence of events

    in the old screen (if the new screen obscures the old screen, a different

    series of events is called in the old screen). See <a

    href="{@docRoot}guide/topics/fundamentals.html#lcycles">Lifecycles</a> discussion

    in Application Fundamentals for details. </p> 

    series of events is called in the old screen). See the <a

    href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activities</a> document for

details. </p> 

<p>Transparent or floating windows are implemented in three

    standard ways: </p>

<ul>
@@ -309,7 +310,8 @@ loopback interface. 
    the application is finalized. See the topics for {@link android.app.Activity#onSaveInstanceState} and

    {@link android.app.Activity#onCreate} for

    examples of storing and retrieving state.</p>

<p>Read more about the lifecycle of an application in <a href="{@docRoot}guide/topics/fundamentals.html">Application Fundamentals</a>.</p>

<p>Read more about the lifecycle of an activity in <a

href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> document.</p>

<h3>Storing and Retrieving Larger or More Complex Persistent Data<a name="storingandretrieving" id="storingandretrieving"></a></h3>

<p>Your application can store files or complex collection objects, and reserve them

    for private use by itself or other activities in the application, or it can expose

docs/html/guide/appendix/install-location.jd

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ applications that should allow installation on external storage, because games d 
provide additional services when innactive. When external storage becomes unavailable and a game

process is killed, there should be no visible effect when the storage becomes available again and

the user restarts the game (assuming that the game properly saved its state during the normal

<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Activity lifecycle</a>).</p>

<a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">Activity lifecycle</a>).</p>



<p>If your application requires several megabytes for the APK file, you should

carefully consider whether to enable the application to install on the external storage so that

docs/html/guide/guide_toc.cs

+71 −55
Original line number Diff line number Diff line
@@ -28,6 +28,16 @@ 
        <span class="zh-CN" style="display:none">Android 是什么？</span>

        <span class="zh-TW" style="display:none">什麼是 Android？</span>

          </a></li>

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

        <span class="en">Application Fundamentals</span>

        <span class="de" style="display:none">Anwendungsgrundlagen</span>

        <span class="es" style="display:none">Fundamentos de las aplicaciones</span>

        <span class="fr" style="display:none">Principes de base des applications</span>

        <span class="it" style="display:none">Concetti fondamentali sulle applicazioni</span>

        <span class="ja" style="display:none">開発の基礎</span>

        <span class="zh-CN" style="display:none">应用程序基础</span>

        <span class="zh-TW" style="display:none">應用程式基本原理</span>

      </a></li>



  <!--  <li><a style="color:gray;">The Android SDK</a></li> -->

  <!--  <li><a style="color:gray;">Walkthrough for Developers</a></li> -->
@@ -47,21 +57,41 @@ 
      <span class="zh-TW" style="display:none">架構主題</span>

    </h2>

    <ul>

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

            <span class="en">Application Fundamentals</span>

            <span class="de" style="display:none">Anwendungsgrundlagen</span>

            <span class="es" style="display:none">Fundamentos de las aplicaciones</span>

            <span class="fr" style="display:none">Principes de base des applications</span>

            <span class="it" style="display:none">Concetti fondamentali sulle applicazioni</span>

            <span class="ja" style="display:none">開発の基礎</span>

            <span class="zh-CN" style="display:none">应用程序基础</span>

            <span class="zh-TW" style="display:none">應用程式基本原理</span>



          </a></li>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/fundamentals/activities.html">

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

        </a></div>

        <ul>

          <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/fragments.html">

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

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

          <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/tasks-and-back-stack.html">

            <span class="en">Tasks and Back Stack</span>

          </a></li>

        </ul>

      </li>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/fundamentals/services.html">

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

        </a></div>

        <ul>

          <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/bound-services.html">

            <span class="en">Bound Services</span>

          </a></li>

        </ul>

      </li>

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

            <span class="en">Content Providers</span>

          </a></li>

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

            <span class="en">Intents and Intent Filters</span>

          </a></li>

      <li><a href="<?cs var:toroot ?>guide/topics/fundamentals/processes-and-threads.html">

            <span class="en">Processes and Threads</span>

          </a></li>

    </ul>





    <ul>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">
@@ -95,7 +125,7 @@ 
                <span class="en">Creating Status Bar Notifications</span>

              </a></li>

            </ul>

          </li>

          </li><!-- end of notifying the user -->

          <li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">

                <span class="en">Applying Styles and Themes</span>

              </a></li>
@@ -112,7 +142,8 @@ 
                <span class="en">How Android Draws Views</span>

              </a></li>

        </ul>

      </li>

      </li><!-- end of User Interface -->

      

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html">

               <span class="en">Application Resources</span>
@@ -144,12 +175,9 @@ 
              <li><a href="<?cs var:toroot ?>guide/topics/resources/style-resource.html">Style</a></li>

              <li><a href="<?cs var:toroot ?>guide/topics/resources/more-resources.html">More Types</a></li>

            </ul>

          </li>

          </li><!-- end of resource types -->

        </ul>

      </li>

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

            <span class="en">Intents and Intent Filters</span>

          </a></li>

      </li><!-- end of app resources -->

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/data/data-storage.html">

            <span class="en">Data Storage</span>
@@ -161,14 +189,9 @@ 
            </li>

          </ul>

      </li>

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

            <span class="en">Content Providers</span>

          </a></li>

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

            <span class="en">Security and Permissions</span>

          </a></li>

  <!--  <li><a style="color:gray;">Processes and Threads</a></li> -->

  <!--  <li><a style="color:gray;">Interprocess Communication</a></li> -->

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-intro.html">

          <span class="en">The AndroidManifest.xml File</span>
@@ -199,8 +222,9 @@ 
          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>

          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>

        </ul>

      </li>

      </li><!-- end of the manifest file -->

    </ul>  

      

    <ul>

      <li class="toggle-list">

        <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">
@@ -511,27 +535,19 @@ 
          <li><a href="<?cs var:toroot ?>guide/developing/tools/mksdcard.html">mksdcard</a></li>

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

          <li class="toggle-list">

                 <div>

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

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

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

                  </a>

                  </div>

            </a></div>

            <ul>

                      <li>

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

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

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

                        </a>

                    </li>

                    <li>

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

                </a></li>

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

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

                        </a>

                    </li>

                    <li>

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

                </a></li>

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

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

                        </a>

                    </li>

                </a></li>

            </ul>

          </li>

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

docs/html/guide/index.jd

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ what it offers, and how your application fits in.</dd> 


<dt><b>Framework Topics</b></dt>

<dd>Discussions of particular parts of the Android framework

and API.  For an overview of the framework, begin with

and API.  For an introduction to the framework, begin with

<a href="{@docRoot}guide/topics/fundamentals.html">Application

Fundamentals</a>.  Then explore other topics &mdash; from 

designing a user interface and setting up resources to storing
@@ -73,8 +73,8 @@ If you want to start by getting a quick look at some code, the 
tutorial walks you through a standard "Hello, World" application to introduce some basics of an

Android application. The 

<a href="{@docRoot}guide/topics/fundamentals.html">Application

Fundamentals</a> document is a good place to start learning the basics about the application

framework.

Fundamentals</a> documentation is a good place to start for an 

understanding of the application framework.

</p>

docs/html/guide/practices/ui_guidelines/activity_task_design.jd

+13 −22
Original line number Diff line number Diff line
@@ -81,8 +81,10 @@ page.title=Activity and Task Design Guidelines 
<p>

  Be sure to look at the <a href="#design_tips">Design Tips</a> section

  for guidelines, tips, and things to avoid. This document is a

  complement to <a href={@docRoot}guide/topics/fundamentals.html

  title="Application Fundamentals">Application Fundamentals</a>, 

  complement to the <a href="{@docRoot}guide/topics/fundamentals.html">Application

Fundamentals</a> documentation (particularly the <a

href="{@docRoot}guide/topics/fundamentals/tasks-and-back-stack.html">Tasks and Back Stack</a>

document),

  which covers the underlying mechanics for programmers.

</p>
@@ -146,9 +148,9 @@ page.title=Activity and Task Design Guidelines 
  

<p>

  An activity handles a particular type of content (data) and accepts a

  set of related user actions. In general, each activity has a 

  <a href={@docRoot}guide/topics/fundamentals.html#actlife

  title=lifecycle>lifecycle</a> that is independent of the other

  set of related user actions. Each activity has a 

  <a href="{@docRoot}guide/topics/fundamentals/activities.html#Lifecycle">lifecycle</a> that is

independent of the other

  activities in its application or task &mdash; each activity is

  launched (started) independently, and the user or system can start,

  run, pause, resume, stop and restart it as needed. Because of this
@@ -225,9 +227,8 @@ page.title=Activity and Task Design Guidelines 
<p>

  An activity is the most prominent of four <em>components</em> of an

  application. The other components are service, content provider and

  broadcast receiver. For more details on activities, see Activity in

  <a href={@docRoot}guide/topics/fundamentals.html#appcomp

  title="Application Components">Application Components</a>.

  broadcast receiver. For more details on activities, see the

  <a href="{@docRoot}guide/topics/fundamentals/activities.html">Activities</a> document.

</p>
@@ -553,15 +554,6 @@ itself. 
      network connection and allows the map to continue loading in the

      background.



      <p>

      Note that when you write an activity, you can make it stop or

      continue running when it is moved to the background (see

      onStop() in <a href={@docRoot}guide/topics/fundamentals.html#actlife

      title="Activity Lifecycle">Activity Lifecycle</a>).

      For activities that download data from the network, it's recommended

      to let them continue downloading so the user can multi-task.

      </p>



    </li>



    <li>
@@ -715,9 +707,8 @@ itself. 
    </p>



    <p>

      For more on intents, see {@link android.content.Intent Intent class} and

      <a href={@docRoot}guide/topics/fundamentals.html#ifilters

      title="intent filters">intent filters</a>.

      For more about intents, see <a

href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent Filters</a>.

    </p>
@@ -914,8 +905,8 @@ itself. 
        Home screen), or from a shortcut icon on the Home screen, or

        from the task switcher.  (The mechanism for this is for the

        activity to have an 

        <a href={@docRoot}guide/topics/fundamentals.html#ifilters

        title="Intent filter">intent filter</a> with action MAIN and

        <a href={@docRoot}guide/topics/intents/intents-filters.html>intent filter</a> with action

MAIN and

        category LAUNCHER.)

      </li>

    </ul>