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

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

Merge "docs: add api overview for jb" into jb-dev

parents aa16a2e0 60dd520d

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