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

Author: scottamain

core/java/android/content/Context.java

@@ -872,7 +872,7 @@ public abstract SQLiteDatabase openOrCreateDatabase(String name,
      *
      * @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

@@ -2,15 +2,19 @@
 
 <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>
-    -->
+    <ul>
       <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

@@ -1,6 +1,4 @@
-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

@@ -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 

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

@@ -8,6 +8,7 @@ parent.link=manifest-intro.html
 <dd><pre class="stx">&lt;service android:<a href="#enabled">enabled</a>=["true" | "false"]
          android:<a href="#exported">exported</a>=["true" | "false"]
          android:<a href="#icon">icon</a>="<i>drawable resource</i>"
+         android:<a href="#isolated">isolatedProcess</a>=["true" | "false"]
          android:<a href="#label">label</a>="<i>string resource</i>"
          android:<a href="#nm">name</a>="<i>string</i>"
          android:<a href="#prmsn">permission</a>="<i>string</i>"
@@ -92,6 +93,12 @@ default icon for all the service's intent filters (see the
 <code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html#icon">icon</a></code> attribute).
 </p></dd> 
 
+<dt><a name="isolated"></a>{@code android:isolatedProcess}</dt>
+<dd>If set to true, this service will run under a special process that is isolated from the
+  rest of the system and has no permissions of its own.
+  The only communication with it is through the Service API 
+  (binding and starting).</dd>
+
 <dt><a name="label"></a>{@code android:label}</dt>
 <dd>A name for the service that can be displayed to users.  
 If this attribute is not set, the label set for the application as a whole is 

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

@@ -705,6 +705,16 @@ device. </td>
 device.</td>
 </tr>
 
+<tr>
+  <td>Television</td>
+  <td><code>android.hardware.type.television</code></td>
+  <td>The application is designed for a television user experience.</td>
+  <td>>This feature defines "television" to be a typical living room television experience: 
+  displayed on a big screen, where the user is sitting far away and the dominant form of 
+  input is be something like a d-pad, and generally not through touch or a 
+  mouse/pointer-device.</td>
+</tr>
+
 <tr>
   <td rowspan="7">Touchscreen</td>
   <td><code>android.hardware.faketouch</code></td>