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

Commit 92d735ac authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "new docs for fragments"

parents 65340f1c c18b5345

docs/html/guide/guide_toc.cs

+3 −0
Original line number Diff line number Diff line
@@ -196,6 +196,9 @@ 
      </li>

    </ul>

    <ul>

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

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

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

      <li class="toggle-list">

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

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

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

0 → 100644
+648 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/guide/topics/manifest/activity-element.jd

+2 −1
Original line number Diff line number Diff line
@@ -290,7 +290,8 @@ activity is ignored. The activity is not re-parented, but destroyed. 
<dd>An icon representing the activity. The icon is displayed to users when 

a representation of the activity is required on-screen.  For example, icons 

for activities that initiate tasks are displayed in the launcher window.  

The icon is often accompanied by a label (see the {@code label} attribute).

The icon is often accompanied by a label (see the <a href="#label">{@code

android:label}</a> attribute).

</p>



<p>

docs/html/guide/topics/manifest/application-element.jd

+7 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ page.title=&lt;application&gt; 
             android:<a href="#icon">icon</a>="<i>drawable resource</i>"

             android:<a href="#killrst">killAfterRestore</a>=["true" | "false"]

             android:<a href="#label">label</a>="<i>string resource</i>"

             android:<a href="#logo">logo</a>="<i>drawable resource</i>"

             android:<a href="#space">manageSpaceActivity</a>="<i>string</i>"

             android:<a href="#nm">name</a>="<i>string</i>"

             android:<a href="#prmsn">permission</a>="<i>string</i>"
@@ -121,7 +122,7 @@ each of the application's components. See the individual 


<p>

This attribute must be set as a reference to a drawable resource containing

the image definition.   There is no default icon.

the image (for example {@code "@drawable/icon"}).   There is no default icon.

</p></dd>



<dt><a name="killrst"></a>{@code android:killAfterRestore}</dt>
@@ -154,6 +155,11 @@ However, as a convenience while you're developing the application, 
it can also be set as a raw string.

</p></dd>



<dt><a name="logo"></a>{@code android:logo}</dt>

<dd>A logo for the application as whole, and the default logo for activities.

<p>This attribute must be set as a reference to a drawable resource containing

the image (for example {@code "@drawable/logo"}).  There is no default logo.</p></dd>



<dt><a name="space"></a>{@code android:manageSpaceActivity}</dt>

<dd>The fully qualified name of an Activity subclass that the system 

can launch to let users manage the memory occupied by the application

docs/html/images/activity_fragment_lifecycle.png

0 → 100644
+49.6 KiB
Loading image diff...