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

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

am 882c97b5: am cdb3f9c4: Merge "docs: add api overview for jb" into jb-dev 

* commit '882c97b5':
  docs: add api overview for jb
parents ca6f644e 882c97b5

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -872,7 +872,7 @@ public abstract class Context { 
     *

     * @throws ActivityNotFoundException

     *

     * @see {@link #startActivity(Intent)}

     * @see #startActivity(Intent)

     * @see PackageManager#resolveActivity

     */

    public abstract void startActivity(Intent intent, Bundle options);

docs/html/about/about_toc.cs

+9 −5
Original line number Diff line number Diff line
@@ -3,14 +3,18 @@ 
<li class="nav-section">

    <div class="nav-section-header"><a href="<?cs var:toroot?>about/index.html">Welcome</a></div>

    <ul>

     <!-- <li><a href="<?cs var:toroot ?>about/marketplace.html">Open Marketplace</a></li>

    

       <li><a href="<?cs var:toroot ?>about/flexible.html">Flexible Framework</a></li>

    -->

      <li><a href="<?cs var:toroot?>about/start.html">Get Started</a></li>

    </ul>

  </li> 



  <li class="nav-section">

    <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/jelly-bean.html">

      <span class="en">Jelly Bean</span></a></div>

      <ul>

        <li><a href="<?cs var:toroot ?>about/versions/android-4.1.html">Android 4.1 APIs</a></li>

      </ul>

  </li>



  <li class="nav-section">

    <div class="nav-section-header"><a href="<?cs var:toroot ?>about/versions/android-4.0-highlights.html">

      <span class="en">Ice Cream Sandwich</span></a></div>

docs/html/about/versions/android-4.0.jd

+2 −4
Original line number Diff line number Diff line 
page.title=Android 4.0 Platform

sdk.platform.version=4.0

sdk.platform.apiLevel=14

page.title=Android 4.1 API Overview

@jd:body



<div id="qv-wrapper">
@@ -1402,7 +1400,7 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code targe 






<h4>Controls for system UI visibility</h4>

<h4 id="SystemUI">Controls for system UI visibility</h4>



<p>Since the early days of Android, the system has managed a UI component known as the <em>status

bar</em>, which resides at the top of handset devices to deliver information such as the carrier

docs/html/about/versions/android-4.1.jd

0 → 100644
+846 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+19 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ parent.link=manifest-intro.html 
          android:<a href="#multi">multiprocess</a>=["true" | "false"]

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

          android:<a href="#nohist">noHistory</a>=["true" | "false"]  <!-- ##api level 3## -->

          android:<a href="#parent">parentActivityName</a>="<i>string</i>" <!-- api level 16 -->

          android:<a href="#prmsn">permission</a>="<i>string</i>"

          android:<a href="#proc">process</a>="<i>string</i>"

          android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" |
@@ -562,6 +563,24 @@ so the user will not be able to return to it. 
<p>

This attribute was introduced in API Level 3.

</p>

</dd>



<!-- api level 16 -->

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

<dd>The class name of the logical parent of the activity. The name here must be formatted

  the same as the corresponding activity is declared in its own

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

  

<p>The system reads this attribute to determine which activity should be started when

  the use presses the Up button in the action bar. The system can also use this information to

  synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.</p>



<p>

This attribute was introduced in API Level 16.

</p>

</dd>







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

<dd>The name of a permission that clients must have to launch the activity