Merge "Fix @link tags in keystore doc" into nyc-docs
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index a085686..7391af8 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -819,8 +819,8 @@
to: /about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
- from: /shareables/...
to: https://commondatastorage.googleapis.com/androiddevelopers/shareables/...
-- from: /downloads/
- to: https://commondatastorage.googleapis.com/androiddevelopers/
+- from: /downloads/...
+ to: https://commondatastorage.googleapis.com/androiddevelopers/...
- from: /training/performance/battery/network/action-any-traffic.html
to: /topic/performance/power/network/action-any-traffic.html
- from: /training/performance/battery/network/action-app-traffic.html
diff --git a/docs/html/auto/images/logos/auto/gmc.png b/docs/html/auto/images/logos/auto/gmc.png
index ab36da1..ee0c1bf 100644
--- a/docs/html/auto/images/logos/auto/gmc.png
+++ b/docs/html/auto/images/logos/auto/gmc.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/koenigsegg.png b/docs/html/auto/images/logos/auto/koenigsegg.png
new file mode 100644
index 0000000..f2cf17b
--- /dev/null
+++ b/docs/html/auto/images/logos/auto/koenigsegg.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/lada.png b/docs/html/auto/images/logos/auto/lada.png
index d172460..77bb5a4 100644
--- a/docs/html/auto/images/logos/auto/lada.png
+++ b/docs/html/auto/images/logos/auto/lada.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/opel.png b/docs/html/auto/images/logos/auto/opel.png
index fcb7040..ecae4db 100644
--- a/docs/html/auto/images/logos/auto/opel.png
+++ b/docs/html/auto/images/logos/auto/opel.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/peugeot.png b/docs/html/auto/images/logos/auto/peugeot.png
index d76a4bc..e2bce36 100644
--- a/docs/html/auto/images/logos/auto/peugeot.png
+++ b/docs/html/auto/images/logos/auto/peugeot.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/renault.png b/docs/html/auto/images/logos/auto/renault.png
index 2970430..c676bd1 100644
--- a/docs/html/auto/images/logos/auto/renault.png
+++ b/docs/html/auto/images/logos/auto/renault.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/seat.png b/docs/html/auto/images/logos/auto/seat.png
index 9802ccf..ddd9d05 100644
--- a/docs/html/auto/images/logos/auto/seat.png
+++ b/docs/html/auto/images/logos/auto/seat.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/ssangyong.png b/docs/html/auto/images/logos/auto/ssangyong.png
index 9e0f117..c50237a 100644
--- a/docs/html/auto/images/logos/auto/ssangyong.png
+++ b/docs/html/auto/images/logos/auto/ssangyong.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/tata.png b/docs/html/auto/images/logos/auto/tata.png
index dfc4a5f..fc405446 100644
--- a/docs/html/auto/images/logos/auto/tata.png
+++ b/docs/html/auto/images/logos/auto/tata.png
Binary files differ
diff --git a/docs/html/auto/images/logos/auto/volvo.png b/docs/html/auto/images/logos/auto/volvo.png
index 683af26..4d39db0 100644
--- a/docs/html/auto/images/logos/auto/volvo.png
+++ b/docs/html/auto/images/logos/auto/volvo.png
Binary files differ
diff --git a/docs/html/auto/index.jd b/docs/html/auto/index.jd
index 167ed7b..e6fde38 100644
--- a/docs/html/auto/index.jd
+++ b/docs/html/auto/index.jd
@@ -499,6 +499,12 @@
</div>
<div class="cols cols-leftp">
<div class="col-5">
+ <a href=" http://koenigsegg.com/">
+ <img src="/auto/images/logos/auto/koenigsegg.png"
+ width="120" height="120" class="img-logo" />
+ </a>
+ </div>
+ <div class="col-5">
<a href=" http://www.lada.ru/en/">
<img src="{@docRoot}auto/images/logos/auto/lada.png"
width="120" height="120" class="img-logo" />
@@ -516,14 +522,14 @@
width="120" height="120" class="img-logo" />
</a>
</div>
+ </div>
+ <div class="cols cols-leftp">
<div class="col-5">
<a href=" http://www.lincoln.com/">
<img src="{@docRoot}auto/images/logos/auto/lincoln.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.mahindra.com/">
<img src="{@docRoot}auto/images/logos/auto/mahindra.png"
@@ -542,15 +548,14 @@
width="120" height="120" class="img-logo" />
</a>
</div>
-
+ </div>
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.mercedes-benz.com/">
<img src="{@docRoot}auto/images/logos/auto/mbenz.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.mitsubishi-motors.com/">
<img src="{@docRoot}auto/images/logos/auto/mitsubishi.png"
@@ -569,16 +574,14 @@
width="120" height="120" class="img-logo" />
</a>
</div>
-
+ </div>
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.peugeot.com/">
<img src="{@docRoot}auto/images/logos/auto/peugeot.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
-
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.ramtrucks.com/">
<img src="{@docRoot}auto/images/logos/auto/ram.png"
@@ -597,15 +600,14 @@
width="120" height="120" class="img-logo" />
</a>
</div>
-
+ </div>
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.seat.com/">
<img src="{@docRoot}auto/images/logos/auto/seat.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.skoda-auto.com/">
<img src="{@docRoot}auto/images/logos/auto/skoda.png"
@@ -624,16 +626,14 @@
width="120" height="120" class="img-logo" />
</a>
</div>
-
+ </div>
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.globalsuzuki.com/automobile/">
<img src="{@docRoot}auto/images/logos/auto/suzuki.png"
width="120" height="120" class="img-logo" />
</a>
</div>
- </div>
-
- <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.tatamotors.com/">
<img src="{@docRoot}auto/images/logos/auto/tata.png"
@@ -652,8 +652,8 @@
width="120" height="120" class="img-logo" />
</a>
</div>
-
-
+ </div>
+ <div class="cols cols-leftp">
<div class="col-5">
<a href="http://www.volvocars.com/intl">
<img src="{@docRoot}auto/images/logos/auto/volvo.png"
@@ -661,7 +661,6 @@
</a>
</div>
</div>
- </div>
</div>
<div class="landing-section landing-red-background">
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index c843567..851674c 100644
--- a/docs/html/guide/topics/manifest/manifest-intro.jd
+++ b/docs/html/guide/topics/manifest/manifest-intro.jd
@@ -6,50 +6,53 @@
<h2>In this document</h2>
<ol>
-<li><a href="#filestruct">Structure of the Manifest File</a></li>
-<li><a href="#filec">File Conventions</a>
-<li><a href="#filef">File Features</a>
- <ol>
- <li><a href="#ifs">Intent Filters</a></li>
- <li><a href="#iconlabel">Icons and Labels</a></li>
- <li><a href="#perms">Permissions</a></li>
- <li><a href="#libs">Libraries</a></li>
- </ol></li>
+<li><a href="#filestruct">Manifest file structure</a></li>
+<li><a href="#filec">File conventions</a>
+<li><a href="#filef">File features</a>
+ <ol>
+ <li><a href="#ifs">Intent filters</a></li>
+ <li><a href="#iconlabel">Icons and labels</a></li>
+ <li><a href="#perms">Permissions</a></li>
+ <li><a href="#libs">Libraries</a></li>
+ </ol></li>
</ol>
</div>
</div>
<p>
- Every application must have an AndroidManifest.xml file (with precisely that
+ Every application must have an {@code AndroidManifest.xml} file (with precisely that
name) in its root directory. <span itemprop="description">The manifest file
- presents essential information about your app to the Android system,
- information the system must have before it can run any of the app's
- code.</span> Among other things, the manifest does the following:
+ provides essential information about your app to the Android system, which
+ the system must have before it can run any of the app's
+ code.</span>
+</p>
+
+<p>
+Among other things, the manifest file does the following:
</p>
<ul>
<li>It names the Java package for the application.
The package name serves as a unique identifier for the application.</li>
-<li>It describes the components of the application — the activities,
-services, broadcast receivers, and content providers that the application is
-composed of. It names the classes that implement each of the components and
-publishes their capabilities (for example, which {@link android.content.Intent
-Intent} messages they can handle). These declarations let the Android system
-know what the components are and under what conditions they can be launched.</li>
+<li>It describes the components of the application, which include the activities,
+services, broadcast receivers, and content providers that compose the application.
+It also names the classes that implement each of the components and
+publishes their capabilities, such as the {@link android.content.Intent
+Intent} messages that they can handle. These declarations inform the Android system
+of the components and the conditions in which they can be launched.</li>
-<li>It determines which processes will host application components.</li>
+<li>It determines the processes that host the application components.</li>
-<li>It declares which permissions the application must have in order to
-access protected parts of the API and interact with other applications.</li>
-
-<li>It also declares the permissions that others are required to have in
+<li>It declares the permissions that the application must have in order to
+access protected parts of the API and interact with other applications. It also declares
+the permissions that others are required to have in
order to interact with the application's components.</li>
<li>It lists the {@link android.app.Instrumentation} classes that provide
-profiling and other information as the application is running. These declarations
+profiling and other information as the application runs. These declarations
are present in the manifest only while the application is being developed and
-tested; they're removed before the application is published.</li>
+are removed before the application is published.</li>
<li>It declares the minimum level of the Android API that the application
requires.</li>
@@ -57,16 +60,27 @@
<li>It lists the libraries that the application must be linked against.</li>
</ul>
+<p class="note"><strong>Note</strong>: As you prepare your Android app to run on Chromebooks,
+there are some important hardware and software feature limitations that you should consider. See
+the <a href="{@docRoot}topic/arc/manifest.html">
+App Manifest Compatibility for Chromebooks</a> document for more information.
+</p>
-<h2 id="filestruct">Structure of the Manifest File</h2>
+<h2 id="filestruct">Manifest file structure</h2>
<p>
-The diagram below shows the general structure of the manifest file and
-every element that it can contain. Each element, along with all of its
-attributes, is documented in full in a separate file. To view detailed
-information about any element, click on the element name in the diagram,
-in the alphabetical list of elements that follows the diagram, or on any
-other mention of the element name.
+The code snippet below shows the general structure of the manifest file and
+every element that it can contain. Each element, along with all of its
+attributes, is fully documented in a separate file.
+</p>
+
+<p class="note"><strong>Tip</strong>: To view detailed
+information about any of the elements that are mentioned within the text of this document,
+simply click the element name.
+</p>
+
+<p>
+Here is an example of the manifest file:
</p>
<pre>
@@ -126,45 +140,45 @@
</pre>
<p>
-All the elements that can appear in the manifest file are listed below
-in alphabetical order. These are the only legal elements; you cannot
+The following list contains all of the elements that can appear in the manifest file,
+in alphabetical order:
+</p>
+
+<ul>
+ <li><code><a href="{@docRoot}guide/topics/manifest/action-element.html"><action></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/category-element.html"><category></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/data-element.html"><data></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html"><instrumentation></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><supports-screens></a></code> <!-- ##api level 4## --></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><uses-configuration></a></code> <!-- ##api level 3## --></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a></code> <!-- ##api level 4## --></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code></li>
+ <li><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></code></li>
+</ul>
+
+<p class="note"><strong>Note</strong>: These are the only legal elements – you cannot
add your own elements or attributes.
</p>
-<p style="margin-left: 2em">
-<code><a href="{@docRoot}guide/topics/manifest/action-element.html"><action></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/category-element.html"><category></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/data-element.html"><data></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/instrumentation-element.html"><instrumentation></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/receiver-element.html"><receiver></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/supports-screens-element.html"><supports-screens></a></code> <!-- ##api level 4## -->
-<br/><code><a href="{@docRoot}guide/topics/manifest/uses-configuration-element.html"><uses-configuration></a></code> <!-- ##api level 3## -->
-<br/><code><a href="{@docRoot}guide/topics/manifest/uses-feature-element.html"><uses-feature></a></code> <!-- ##api level 4## -->
-<br/><code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-<br/><code><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><uses-sdk></a></code>
-</p>
-
-
-
-
-<h2 id="filec">File Conventions</h2>
+<h2 id="filec">File conventions</h2>
<p>
-Some conventions and rules apply generally to all elements and attributes
-in the manifest:
+This section describes the conventions and rules that apply generally to all of the elements and
+attributes in the manifest file.
</p>
<dl>
@@ -172,29 +186,28 @@
<dd>Only the
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> and
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-elements are required, they each must be present and can occur only once.
-Most of the others can occur many times or not at all — although at
-least some of them must be present for the manifest to accomplish anything
-meaningful.
+elements are required. They each must be present and can occur only once.
+Most of the other elements can occur many times or not at all. However, at
+least some of them must be present before the manifest file becomes useful.
<p>
If an element contains anything at all, it contains other elements.
-All values are set through attributes, not as character data within an element.
+All of the values are set through attributes, not as character data within an element.
</p>
<p>
-Elements at the same level are generally not ordered. For example,
+Elements at the same level are generally not ordered. For example, the
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>,
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code>, and
<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>
elements can be intermixed in any sequence. There are two key exceptions to this
-rule, however:
+rule:
<ul>
<li>
An <code><a href="{@docRoot}guide/topics/manifest/activity-alias-element.html"><activity-alias></a></code>
element must follow the
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
- it is an alias for.
+ for which it is an alias.
</li>
<li>
The <code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
@@ -207,15 +220,15 @@
</p></dd>
<dt><b>Attributes</b></dt>
-<dd>In a formal sense, all attributes are optional. However, there are some
-that must be specified for an element to accomplish its purpose. Use the
-documentation as a guide. For truly optional attributes, it mentions a default
+<dd>In a formal sense, all attributes are optional. However, there are some attributes
+that must be specified so that an element can accomplish its purpose. Use the
+documentation as a guide. For truly optional attributes, it mentions a default
value or states what happens in the absence of a specification.
<p>Except for some attributes of the root
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
-element, all attribute names begin with an {@code android:} prefix —
-for example, {@code android:alwaysRetainTaskState}. Because the prefix is
+element, all attribute names begin with an {@code android:} prefix.
+For example, {@code android:alwaysRetainTaskState}. Because the prefix is
universal, the documentation generally omits it when referring to attributes
by name.</p></dd>
@@ -223,7 +236,7 @@
<dd>Many elements correspond to Java objects, including elements for the
application itself (the
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
-element) and its principal components — activities
+element) and its principal components: activities
(<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>),
services
(<code><a href="{@docRoot}guide/topics/manifest/service-element.html"><service></a></code>),
@@ -238,7 +251,7 @@
{@link android.content.BroadcastReceiver}, and {@link android.content.ContentProvider}),
the subclass is declared through a {@code name} attribute. The name must include
the full package designation.
-For example, an {@link android.app.Service} subclass might be declared as follows:
+For example, a {@link android.app.Service} subclass might be declared as follows:
</p>
<pre><manifest . . . >
@@ -251,12 +264,12 @@
</manifest></pre>
<p>
-However, as a shorthand, if the first character of the string is a period, the
-string is appended to the application's package name (as specified by the
+However, if the first character of the string is a period, the
+application's package name (as specified by the
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code>
element's
<code><a href="{@docRoot}guide/topics/manifest/manifest-element.html#package">package</a></code>
-attribute). The following assignment is the same as the one above:
+attribute) is appended to the string. The following assignment is the same as that shown above:
</p>
<pre><manifest package="com.example.project" . . . >
@@ -269,13 +282,13 @@
</manifest></pre>
<p>
-When starting a component, Android creates an instance of the named subclass.
+When starting a component, the Android system creates an instance of the named subclass.
If a subclass isn't specified, it creates an instance of the base class.
</p></dd>
<dt><b>Multiple values</b></dt>
<dd>If more than one value can be specified, the element is almost always
-repeated, rather than listing multiple values within a single element.
+repeated, rather than multiple values being listed within a single element.
For example, an intent filter can list several actions:
<pre><intent-filter . . . >
@@ -286,108 +299,105 @@
</intent-filter></pre></dd>
<dt><b>Resource values</b></dt>
-<dd>Some attributes have values that can be displayed to users — for
-example, a label and an icon for an activity. The values of these attributes
-should be localized and therefore set from a resource or theme. Resource
-values are expressed in the following format,</p>
+<dd>Some attributes have values that can be displayed to users, such as
+a label and an icon for an activity. The values of these attributes
+should be localized and set from a resource or theme. Resource
+values are expressed in the following format:</p>
<p style="margin-left: 2em">{@code @[<i>package</i>:]<i>type</i>/<i>name</i>}</p>
<p>
-where the <i>package</i> name can be omitted if the resource is in the same package
-as the application, <i>type</i> is a type of resource — such as "string" or
-"drawable" — and <i>name</i> is the name that identifies the specific resource.
-For example:
+You can ommit the <i>package</i> name if the resource is in the same package
+as the application. The <i>type</i> is a type of resource, such as <em>string</em> or
+<em>drawable</em>, and the <i>name</i> is the name that identifies the specific resource.
+Here is an example:
</p>
<pre><activity android:icon="@drawable/smallPic" . . . ></pre>
<p>
-Values from a theme are expressed in a similar manner, but with an initial '{@code ?}'
-rather than '{@code @}':
+The values from a theme are expressed similarly, but with an initial {@code ?}
+instead of {@code @}:
</p>
<p style="margin-left: 2em">{@code ?[<i>package</i>:]<i>type</i>/<i>name</i>}
</p></dd>
<dt><b>String values</b></dt>
-<dd>Where an attribute value is a string, double backslashes ('{@code \\}')
-must be used to escape characters — for example, '{@code \\n}' for
-a newline or '{@code \\uxxxx}' for a Unicode character.</dd>
+<dd>Where an attribute value is a string, you must use double backslashes ({@code \\})
+to escape characters, such as {@code \\n} for
+a newline or {@code \\uxxxx} for a Unicode character.</dd>
</dl>
-
-<h2 id="filef">File Features</h2>
+<h2 id="filef">File features</h2>
<p>
-The following sections describe how some Android features are reflected
+The following sections describe the way that some Android features are reflected
in the manifest file.
</p>
-<h3 id="ifs">Intent Filters</h3>
+<h3 id="ifs">Intent filters</h3>
<p>
-The core components of an application (its activities, services, and broadcast
-receivers) are activated by <i>intents</i>. An intent is a
+The core components of an application, such as its activities, services, and broadcast
+receivers, are activated by <i>intents</i>. An intent is a
bundle of information (an {@link android.content.Intent} object) describing a
-desired action — including the data to be acted upon, the category of
+desired action, including the data to be acted upon, the category of
component that should perform the action, and other pertinent instructions.
-Android locates an appropriate component to respond to the intent, launches
+The Android system locates an appropriate component that can respond to the intent, launches
a new instance of the component if one is needed, and passes it the
-Intent object.
+{@link android.content.Intent} object.
</p>
<p>
-Components advertise their capabilities — the kinds of intents they can
-respond to — through <i>intent filters</i>. Since the Android system
-must learn which intents a component can handle before it launches the component,
+The components advertise the types of intents that they can
+respond to through <i>intent filters</i>. Since the Android system
+must learn the intents that a component can handle before it launches the component,
intent filters are specified in the manifest as
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-elements. A component may have any number of filters, each one describing
+elements. A component can have any number of filters, each one describing
a different capability.
</p>
<p>
-An intent that explicitly names a target component will activate that component;
-the filter doesn't play a role. But an intent that doesn't specify a target by
+An intent that explicitly names a target component activates that component, so
+the filter doesn't play a role. An intent that doesn't specify a target by
name can activate a component only if it can pass through one of the component's
filters.
</p>
<p>
-For information on how Intent objects are tested against intent filters,
-see a separate document,
-<a href="{@docRoot}guide/components/intents-filters.html">Intents
-and Intent Filters</a>.
+For information about how {@link android.content.Intent} objects are tested against intent filters,
+see the <a href="{@docRoot}guide/components/intents-filters.html">Intents
+and Intent Filters</a> document.
</p>
-
-<h3 id="iconlabel">Icons and Labels</h3>
+<h3 id="iconlabel">Icons and labels</h3>
<p>
A number of elements have {@code icon} and {@code label} attributes for a
-small icon and a text label that can be displayed to users. Some also have a
-{@code description} attribute for longer explanatory text that can also be
-shown on-screen. For example, the
+small icon and a text label that can be displayed to users. Some also have a
+{@code description} attribute for longer, explanatory text that can also be
+shown on-screen. For example, the
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-element has all three of these attributes, so that when the user is asked whether
+element has all three of these attributes so that when the user is asked whether
to grant the permission to an application that has requested it, an icon representing
the permission, the name of the permission, and a description of what it
-entails can all be presented to the user.
+entails are all presented to the user.
</p>
<p>
-In every case, the icon and label set in a containing element become the default
+In every case, the icon and label that are set in a containing element become the default
{@code icon} and {@code label} settings for all of the container's subelements.
-Thus, the icon and label set in the
+Thus, the icon and label that are set in the
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
element are the default icon and label for each of the application's components.
-Similarly, the icon and label set for a component — for example, an
+Similarly, the icon and label that are set for a component, such as an
<code><a href="{@docRoot}guide/topics/manifest/activity-element.html"><activity></a></code>
-element — are the default settings for each of the component's
+element, are the default settings for each of the component's
<code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code>
-elements. If an
+elements. If an
<code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code>
element sets a label, but an activity and its intent filter do not,
the application label is treated as the label for both the activity and
@@ -395,62 +405,62 @@
</p>
<p>
-The icon and label set for an intent filter are used to represent a component
-whenever the component is presented to the user as fulfilling the function
-advertised by the filter. For example, a filter with
-"{@code android.intent.action.MAIN}" and
-"{@code android.intent.category.LAUNCHER}" settings advertises an activity
-as one that initiates an application — that is, as
-one that should be displayed in the application launcher. The icon and label
-set in the filter are therefore the ones displayed in the launcher.
+The icon and label that are set for an intent filter represent a component
+whenever the component is presented to the user and fulfills the function
+that is advertised by the filter. For example, a filter with
+{@code android.intent.action.MAIN} and
+{@code android.intent.category.LAUNCHER} settings advertises an activity
+as one that initiates an application. That is, as
+one that should be displayed in the application launcher. The icon and label
+that are set in the filter are displayed in the launcher.
</p>
-
<h3 id="perms">Permissions</h3>
<p>
-A <i>permission</i> is a restriction limiting access to a part of the code
-or to data on the device. The limitation is imposed to protect critical
+A <i>permission</i> is a restriction that limits access to a part of the code
+or to data on the device. The limitation is imposed to protect critical
data and code that could be misused to distort or damage the user experience.
</p>
<p>
-Each permission is identified by a unique label. Often the label indicates
-the action that's restricted. For example, here are some permissions defined
+Each permission is identified by a unique label. Often the label indicates
+the action that's restricted. Here are some permissions that are defined
by Android:
</p>
-<p style="margin-left: 2em">{@code android.permission.CALL_EMERGENCY_NUMBERS}
-<br/>{@code android.permission.READ_OWNER_DATA}
-<br/>{@code android.permission.SET_WALLPAPER}
-<br/>{@code android.permission.DEVICE_POWER}</p>
+<ul>
+ <li>{@code android.permission.CALL_EMERGENCY_NUMBERS}</li>
+ <li>{@code android.permission.READ_OWNER_DATA}</li>
+ <li>{@code android.permission.SET_WALLPAPER}</li>
+ <li>{@code android.permission.DEVICE_POWER}</li>
+</ul>
<p>
-A feature can be protected by at most one permission.
+A feature can be protected by only one permission.
</p>
<p>
-If an application needs access to a feature protected by a permission,
-it must declare that it requires that permission with a
+If an application needs access to a feature that is protected by a permission,
+it must declare that it requires the permission with a
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-element in the manifest. Then, when the application is installed on
-the device, the installer determines whether or not to grant the requested
+element in the manifest. When the application is installed on
+the device, the installer determines whether to grant the requested
permission by checking the authorities that signed the application's
certificates and, in some cases, asking the user.
If the permission is granted, the application is able to use the protected
-features. If not, its attempts to access those features will simply fail
+features. If not, its attempts to access those features fail
without any notification to the user.
</p>
<p>
-An application can also protect its own components (activities, services,
-broadcast receivers, and content providers) with permissions. It can employ
-any of the permissions defined by Android (listed in
-{@link android.Manifest.permission android.Manifest.permission}) or declared
-by other applications. Or it can define its own. A new permission is declared
+An application can also protect its own components with permissions. It can employ
+any of the permissions that are defined by Android, as listed in
+{@link android.Manifest.permission android.Manifest.permission}, or declared
+by other applications. It can also define its own. A new permission is declared
with the
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-element. For example, an activity could be protected as follows:
+element. For example, an activity could be protected as follows:
</p>
<pre>
@@ -474,34 +484,34 @@
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
element, its use is also requested with the
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>
-element. Its use must be requested in order for other components of the
+element. You must request its use in order for other components of the
application to launch the protected activity, even though the protection
is imposed by the application itself.
</p>
<p>
-If, in the same example, the {@code permission} attribute was set to a
-permission declared elsewhere
-(such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not
-have been necessary to declare it again with a
+If, in the same example shown above, the {@code permission} attribute was set to a
+permission that is declared elsewhere,
+such as {@code android.permission.CALL_EMERGENCY_NUMBERS}, it would not
+be necessary to declare it again with a
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-element. However, it would still have been necessary to request its use with
+element. However, it would still be necessary to request its use with
<code><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><uses-permission></a></code>.
</p>
<p>
The
<code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code>
-element declares a namespace for a group of permissions that will be defined in
-code. And
+element declares a namespace for a group of permissions that are defined in
+code, and the
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-defines a label for a set of permissions (both those declared in the manifest with
+defines a label for a set of permissions, both those declared in the manifest with
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
-elements and those declared elsewhere). It affects only how the permissions are
-grouped when presented to the user. The
+elements and those declared elsewhere. This affects only how the permissions are
+grouped when presented to the user. The
<code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code>
-element does not specify which permissions belong to the group;
-it just gives the group a name. A permission is placed in the group
+element does not specify the permissions that belong to the group, but
+it gives the group a name. You can place a permission in the group
by assigning the group name to the
<code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code>
element's
@@ -515,15 +525,14 @@
<p>
Every application is linked against the default Android library, which
includes the basic packages for building applications (with common classes
-such as Activity, Service, Intent, View, Button, Application, ContentProvider,
-and so on).
+such as Activity, Service, Intent, View, Button, Application, and ContentProvider).
</p>
<p>
-However, some packages reside in their own libraries. If your application
-uses code from any of these packages, it must explicitly asked to be linked
-against them. The manifest must contain a separate
+However, some packages reside in their own libraries. If your application
+uses code from any of these packages, it must explicitly ask to be linked
+against them. The manifest must contain a separate
<code><a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library></a></code>
-element to name each of the libraries. (The library name can be found in the
-documentation for the package.)
+element to name each of the libraries. You can find the library name in the
+documentation for the package.
</p>
diff --git a/docs/html/guide/topics/ui/layout/grid.jd b/docs/html/guide/topics/ui/layout/grid.jd
index 31f9b9c..cc53651 100644
--- a/docs/html/guide/topics/ui/layout/grid.jd
+++ b/docs/html/guide/topics/ui/layout/grid.jd
@@ -23,17 +23,32 @@
<img src="{@docRoot}images/ui/gridlayout.png" alt="" />
-<p>{@link android.widget.TableLayout} positions its children into rows
- and columns. TableLayout containers do not display border lines for their rows, columns,
- or cells. The table will have as many columns as the row with the most cells. A table can leave
-cells empty, but cells cannot span columns, as they can in HTML.</p>
-<p>{@link android.widget.TableRow} objects are the child views of a TableLayout
-(each TableRow defines a single row in the table).
-Each row has zero or more cells, each of which is defined by any kind of other View. So, the cells of a row may be
-composed of a variety of View objects, like ImageView or TextView objects.
-A cell may also be a ViewGroup object (for example, you can nest another TableLayout as a cell).</p>
-<p>The following sample layout has two rows and two cells in each. The accompanying screenshot shows the
-result, with cell borders displayed as dotted lines (added for visual effect). </p>
+<p>
+ {@link android.widget.TableLayout} positions its children into rows and
+ columns. TableLayout containers do not display border lines for their rows,
+ columns, or cells. The table will have as many columns as the row with the
+ most cells. A table can leave cells empty. Cells can span multiple columns,
+ as they can in HTML. You can span columns by using the <code>span</code>
+ field in the {@link android.widget.TableRow.LayoutParams} class.
+</p>
+
+<p class="note">
+ <strong>Note:</strong> Cells cannot span multiple rows.
+</p>
+
+<p>
+ {@link android.widget.TableRow} objects are the child views of a TableLayout
+ (each TableRow defines a single row in the table). Each row has zero or more
+ cells, each of which is defined by any kind of other View. So, the cells of
+ a row may be composed of a variety of View objects, like ImageView or
+ TextView objects. A cell may also be a ViewGroup object (for example, you
+ can nest another TableLayout as a cell).
+</p>
+<p>
+ The following sample layout has two rows and two cells in each. The
+ accompanying screenshot shows the result, with cell borders displayed as
+ dotted lines (added for visual effect).
+</p>
<table class="columns">
<tr>
diff --git a/docs/html/images/topic/arc/sideload_figure_1.jpg b/docs/html/images/topic/arc/sideload_figure_1.jpg
new file mode 100644
index 0000000..8eb5085
--- /dev/null
+++ b/docs/html/images/topic/arc/sideload_figure_1.jpg
Binary files differ
diff --git a/docs/html/topic/arc/_book.yaml b/docs/html/topic/arc/_book.yaml
new file mode 100644
index 0000000..42287a7
--- /dev/null
+++ b/docs/html/topic/arc/_book.yaml
@@ -0,0 +1,9 @@
+toc:
+- title: Optimizing Apps for Chromebooks
+ path: /topic/arc/index.html
+- title: App Manifest Compatibility for Chromebooks
+ path: /topic/arc/manifest.html
+- title: Loading Apps on Chromebooks
+ path: /topic/arc/sideload.html
+- title: Chrome OS Device Support for Apps
+ path: /topic/arc/device-support.html
diff --git a/docs/html/topic/arc/device-support.jd b/docs/html/topic/arc/device-support.jd
new file mode 100644
index 0000000..fc471ac
--- /dev/null
+++ b/docs/html/topic/arc/device-support.jd
@@ -0,0 +1,153 @@
+page.title=Chrome OS Device Support for Apps
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>On this page</h2>
+
+ <ol>
+ <li><a href="#overview">Overview</a></li>
+ <li><a href="#support">Supported Platforms</a></li>
+ </ol>
+ </div>
+ </div>
+
+<p>
+You can use the Google Play Store to install Android apps on several Google
+Chromebooks. This document describes the Chromebooks, Chromeboxes, and
+Chromebases that can install Android apps, both currently and in upcoming
+releases of Chrome OS.
+</p>
+
+<h2 id="overview">Overview</h2>
+
+<p>
+The same Android apps that run on phones and tablets can run on Chromebooks
+without compromising their speed, simplicity, or security. To develop the best
+experience for Android apps across Chromebooks, you should test your app on a
+suite of devices that consists of the following categories:
+</p>
+
+<ul>
+ <li>
+ ARM architecture.
+ </li>
+ <li>
+ Intel x86 architecture.
+ </li>
+ <li>
+ Touch.
+ </li>
+ <li>
+ Non-touch (uses fake-touch).
+ </li>
+ <li>
+ Convertible.
+ </li>
+</ul>
+
+<p>To learn more about Google Play Store support on Chromebooks, see the
+following <a class="external-link"
+href="https://chrome.googleblog.com/2016/05/the-google-play-store-coming-to.html">
+Google Chrome blog post</a>.
+</p>
+
+<p class="note"><strong>Note: </strong>You may elect to exclude your app from
+being available to certain Android devices, such as Chromebooks. For more
+information, visit <a class="external-link"
+href="https://support.google.com/googleplay/android-developer/answer/1286017">
+View & restrict your app's compatible devices</a>.
+</p>
+
+<p>
+The following section lists the Chromebooks that work with Android apps and the
+categories that each device satisfies.
+</p>
+
+<h2 id="support">Supported Platforms</h2>
+
+<p>
+Android apps are not available on every Chromebook, but Google continues to
+evaluate more devices based on a range of factors, such as processor type, GPU,
+and drivers. The following table shows the platforms that currently support
+Android apps:
+</p>
+
+<p class="table-caption" id="Objects-and-interfaces">
+ <strong>Table 1.</strong> Chromebooks that currently support Android apps.</p>
+<table>
+ <tr>
+ <th scope="col">Manufacturer</th>
+ <th scope="col">Model</th>
+ <th scope="col">Architecture</th>
+ <th scope="col">Touchscreen support</th>
+ <th scope="col">Convertible</th>
+ </tr>
+ <tr>
+ <td>Acer</td>
+ <td>Chromebook R11 / C738T</td>
+ <td>Intel x86</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>Asus</td>
+ <td>Chromebook Flip</td>
+ <td>ARM</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>Google</td>
+ <td>Chromebook Pixel (2015)</td>
+ <td>Intel x86</td>
+ <td>Yes</td>
+ <td>No</td>
+ </tr>
+</table>
+
+<p>
+The following list shows the platforms that will support Android apps in an
+upcoming release of Chrome OS:
+</p>
+
+<ul>
+ <li><strong>Acer: </strong>Chromebook 11 C740, Chromebook 11 CB3-111 / C730 /
+ C730E / CB3-131, Chromebook 14 CB3-431, Chromebook 14 for Work, Chromebook
+ 15 CB5-571 / C910, Chromebook 15 CB3-531, Chromebox CXI2, Chromebase 24
+ </li>
+ <li><strong>Asus: </strong>Chromebook C200, Chromebook C201,
+ Chromebook C202SA, Chromebook C300SA, Chromebook C300, Chromebox CN62,
+ Chromebit CS10</li>
+ <li><strong>AOpen: </strong>Chromebox Commercial,
+ Chromebase Commercial 22"</li>
+ <li><strong>Bobicus: </strong>Chromebook 11</li>
+ <li><strong>CDI: </strong>eduGear Chromebook K Series,
+ eduGear Chromebook M Series, eduGear Chromebook R Series</li>
+ <li><strong>CTL: </strong>Chromebook J2 / J4, N6 Education Chromebook,
+ J5 Convertible Chromebook</li>
+ <li><strong>Dell: </strong>Chromebook 11 3120, Chromebook 13 7310</li>
+ <li><strong>Edxis: </strong>Chromebook, Education Chromebook</li>
+ <li><strong>Haier: </strong>Chromebook 11, Chromebook 11e, Chromebook 11 G2
+ </li>
+ <li><strong>Hexa: </strong>Chromebook Pi</li>
+ <li><strong>HiSense: </strong>Chromebook 11</li>
+ <li><strong>Lava: </strong>Xolo Chromebook</li>
+ <li><strong>HP: </strong>Chromebook 11 G3 / G4 / G4 EE, Chromebook 14 G4,
+ Chromebook 13</li>
+ <li><strong>Lenovo: </strong>100S Chromebook, N20 / N20P Chromebook,
+ N21 Chromebook, ThinkCentre Chromebox, ThinkPad 11e Chromebook,
+ N22 Chromebook, Thinkpad 13 Chromebook, Thinkpad 11e Chromebook Gen 3</li>
+ <li><strong>Medion: </strong>Akoya S2013, Chromebook S2015</li>
+ <li><strong>M&A: </strong>Chromebook</li>
+ <li><strong>NComputing: </strong>Chromebook CX100</li>
+ <li><strong>Nexian: </strong>Chromebook 11.6"</li>
+ <li><strong>PCMerge: </strong>Chromebook PCM-116E</li>
+ <li><strong>Poin2: </strong>Chromebook 11</li>
+ <li><strong>Samsung: </strong>Chromebook 2 11" - XE500C12, Chromebook 3</li>
+ <li><strong>Sector 5: </strong>E1 Rugged Chromebook</li>
+ <li><strong>Senkatel: </strong>C1101 Chromebook</li>
+ <li><strong>Toshiba: </strong>Chromebook 2, Chromebook 2 (2015)</li>
+ <li><strong>True IDC: </strong>Chromebook 11</li>
+ <li><strong>Viglen: </strong>Chromebook 11</li>
+</ul>
diff --git a/docs/html/topic/arc/index.jd b/docs/html/topic/arc/index.jd
new file mode 100644
index 0000000..d46fbc8
--- /dev/null
+++ b/docs/html/topic/arc/index.jd
@@ -0,0 +1,398 @@
+page.title=Optimizing Apps for Chromebooks
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>On this page</h2>
+
+ <ol>
+ <li><a href="#update-manifest">Update Your App's Manifest File</a></li>
+ <li><a href="#leverage">Leverage Support for Multi-Window Mode</li>
+ <li><a href="#keyboard">Support the Keyboard, Trackpad, and Mouse</a></li>
+ <li><a href="#backup">Use Backup and Restore Effectively</a></li>
+ <li><a href="#update-ndk">Update the NDK Libraries</a></li>
+ <li><a href="#support-new-features">Plan Support for New Android Features</a></li>
+ <li><a href="#testing">Test Your App</a></li>
+ <li><a href="#setup">Set Up ADB</a></li>
+ <li><a href="#learning-materials">Additional Learning Materials</a></li>
+ </ol>
+ </div>
+ </div>
+
+<p>
+Google Chromebooks now support the Google Play Store and Android apps. This
+document describes some ways that you can optimize your Android apps for
+Chromebooks.
+</p>
+
+<h2 id="update-manifest">Update Your App's Manifest File</h2>
+
+<p>
+To begin optimizing your Android app for Chromebooks, update your manifest file
+(<code>AndroidManifest.xml</code>) to account for some key hardware and software
+differences between Chromebooks and other devices running Android.
+</p>
+
+<p>
+As of Chrome OS version M53, all Android apps that don't explicitly require the
+<a
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features"><code>android.hardware.touchscreen</code></a>
+feature will also work on Chrome OS devices that support the
+<code>android.hardware.faketouch</code> feature. However, if you want your app
+to work on all Chromebooks in the best possible way, go to your manifest file
+and adjust the settings so that the <code>android.hardware.touchscreen</code>
+feature is not required, as shown in the following example. You should also
+review your mouse and keyboard interactions.
+</p>
+
+<pre>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ ... >
+ <!-- Some Chromebooks don't support touch. Although not essential,
+ it's a good idea to explicitly include this declaration. -->
+ <uses-feature android:name="android.hardware.touchscreen"
+ required="false" />
+</manifest>
+</pre>
+
+<p>
+Different devices often have different sensors available in them. See the <a
+href="https://developer.android.com/guide/topics/sensors/sensors_overview.html">Sensors
+Overview</a> document for an overview of all sensors that the Android platform
+supports. Although Android handheld devices may have GPS and accelerometers,
+sensors are not guaranteed to be available in every Chromebook. However, there
+are cases where the functionality of a sensor is provided in another way. For
+example, Chromebooks may not have GPS sensors, but they still provide location
+data based on Wi-Fi connections. If you want your app to run on Chromebooks,
+regardless of sensor support, you should update your manifest file so that none
+of the sensors are required.
+</p>
+
+<p class="note"><strong>Note</strong>: If you don't require a particular sensor
+for your app but still use measurements from the sensor when it's available,
+make sure you dynamically check for the sensor's availability before trying to
+gather information from it in your app.
+</p>
+
+<p>
+Some software features are unsupported on Chromebooks. For example, apps that
+provide custom IMEs, app widgets, live wallpapers, and app launchers aren't
+supported and won't be available for installation on Chromebooks. For a complete
+list of software features that aren't currently supported on Chromebooks, see <a
+href="{@docRoot}topic/arc/manifest.html#incompat-software-features">incompatible
+software features</a>.
+</p>
+
+<h2 id="leverage">Leverage Support for Multi-Window Mode</h2>
+
+<p>
+The implementation of Android apps on Chrome OS includes basic multi-window
+support. Instead of automatically drawing over the full screen, Android renders
+apps on Chrome OS into layouts that are appropriate for this form factor. Google
+provides support for the most common window layouts:
+
+<ul>
+ <li>
+ <strong>Portrait</strong> – Similar to Nexus 5.
+ </li>
+ <li>
+ <strong>Landscape</strong> – Similar to Nexus 7.
+ </li>
+ <li>
+ <strong>Maximized</strong> – Uses all available screen pixels.
+ </li>
+</ul>
+
+<p>
+In addition, end users are presented with window controls to toggle among all
+available layouts. By choosing the correct orientation option, you can ensure
+that the user has the correct layout upon launching the app. If an app is
+available in portrait and landscape, it defaults to landscape if possible. After
+this option is set, it is remembered on a per-app basis. Google recommends that
+you test your app to ensure that it handles changes in window size
+appropriately.
+</p>
+
+<h2 id="keyboard">Support the Keyboard, Trackpad, and Mouse</h2>
+
+<p>
+All Chromebooks have a physical keyboard and a trackpad, and some Chromebooks
+have a touchscreen as well. Some devices can even convert from a laptop to a
+tablet.
+</p>
+
+<p>
+Many existing apps already support mouse and trackpad interactions with no extra
+work required. However, it's always best to adjust your app's behavior
+appropriately when users interact with it using a trackpad instead of a
+touchscreen, and you should support and distinguish between both interfaces
+properly. Given the support for physical keyboards, you can now provide hotkeys
+to enable your app's users to be more productive. For example, if your app
+supports printing, you can use <strong>Ctrl+P</strong> to open a print dialog.
+</p>
+
+<h2 id="backup">Use Backup and Restore Effectively</h2>
+
+<p>
+One of the strongest features of Chromebooks is that users can easily migrate
+from one device to another. That is, if someone stops using one Chromebook and
+starts using another, they simply have to sign in, and all of their apps appear.
+</p>
+
+<p class="note"><strong>Tip: </strong> Although it's not mandatory, backing up
+your app's data to the cloud is a good idea.
+</p>
+
+<p>
+Chromebooks can also be shared among a large number of people, such as in
+schools. Since local storage is not infinite, entire accounts—together
+with their storage—can be removed from the device at any point. For
+educational settings, it's a good idea to keep this scenario in mind.
+</p>
+
+<h2 id="update-ndk">Update the NDK Libraries</h2>
+
+<p>
+If your app uses the Android NDK libraries, and its target SDK version is 23 or
+higher, ensure that text relocations are removed from both the ARM and x86
+versions of your NDK libraries, as they're not compatible in Android 6.0 (API
+level 23) and higher. By leaving text relocations in your NDK libraries, you may
+also cause incompatibility errors with Chromebooks, especially when running on
+a device that uses an x86 architecture.
+</p>
+
+<p class="note"><strong>Note: </strong>To view more details on updating NDK
+libraries properly, see the <a
+href="https://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-runtime">
+Runtime</a> section of the Android 6.0 Changes document.
+</p>
+
+<h2 id="support-new-features">Plan Support for New Android Features</h2>
+
+<p>
+Android apps on Chromebooks initially ship with APIs for Android 6.0 (API level
+23). By following the best practices outlined above, your app is likely to be
+compatible with the multi-window improvements introduced in Android 7.0 (API
+level 24). It's good to plan support for the APIs and behaviors available as of
+Android 7.0, which feature several improvements. For example, multi-window
+support is better integrated, and you're able to resize activities arbitrarily,
+making them feel more natural. You can also access APIs for drag-and-drop
+operations across apps and mouse cursor control.
+</p>
+
+<h2 id="testing">Test Your App</h2>
+
+<p>
+To <a href="{@docRoot}topic/arc/sideload.html">load</a> your app onto your
+Chromebook for testing, you must enter <em>Developer</em> mode on your Chrome OS
+device and enable <em>unknown sources</em>. See the <a class="external-link"
+href="https://www.chromium.org/chromium-os/poking-around-your-chrome-os-device#TOC-Putting-your-Chrome-OS-Device-into-Developer-Mode">
+Putting your Chrome OS Device into Developer Mode</a> document for detailed
+instructions about moving your device into Developer mode. After your device is
+in Developer mode, you can go to your Chrome settings and select <strong>Enable
+Unknown Sources</strong> under the <em>security in app</em> settings.
+</p>
+
+<p>
+After enabling Developer mode, you can load an Android app onto your Chrome OS
+device using one of several methods. For more details, see the <a
+href="{@docRoot}topic/arc/sideload.html#load-app">Load Your App</a> section of
+the Loading Apps on Chromebooks page.
+</p>
+
+<p class="note"><strong>Note: </strong>To ensure that your Android app works
+well on a variety of Chromebook devices and available form factors, Google
+recommends that you test your app on an ARM-based Chromebook, an x86-based
+Chromebook, a device with a touchscreen and one without one, and on a
+convertible device (one that can change between a laptop and a tablet). To view
+the full list of supported devices, see the <a
+href="{@docRoot}topic/arc/device-support.html">Chrome OS Device Support for
+Apps</a> page.</p>
+
+<h2 id="setup">Set Up ADB</h2>
+
+<p>
+Before attempting to set up an ADB connection, you must start your Chrome OS in
+<a class="external-link"
+href="https://www.chromium.org/chromium-os/poking-around-your-chrome-os-device">
+Developer Mode</a> so that you have the ability to install Android apps on the
+Chromebook.
+</p>
+
+<p class="caution"><strong>Caution: </strong>After switching your Chrome OS
+device to Developer mode, it restarts and clears all existing data on the
+device.
+</p>
+
+<p>
+To set up ADB, complete the following steps:
+</p>
+
+<ol>
+ <li>
+ Press <strong>Ctrl+D</strong> to start your device.
+ </li>
+ <li>
+ Finish the setup process.
+ </li>
+ <li>
+ Log into your test account.
+ </li>
+ <li>
+ Accept the Google Play Store terms and service conditions.
+ </li>
+</ol>
+
+<h3>Configure the firewall</h3>
+
+<p>
+To configure the Chrome OS firewall to allow incoming ADB connections, complete
+the following steps:
+</p>
+
+<ol>
+ <li>
+ Press <strong>Ctrl+Alt+T</strong> to start the Chrome OS terminal.
+ </li>
+ <li>
+ Type <strong>shell</strong> to get to the bash command shell:
+<pre class="no-pretty-print">
+crosh> shell
+chronos@localhost / $
+</pre>
+ </li>
+ <li>
+ Type the following commands to set up developer features and enable
+ disk-write access for the firewall settings changes:
+<pre class="no-pretty-print">
+chronos@localhost / $ sudo /usr/libexec/debugd/helpers/dev_features_rootfs_verification
+chronos@localhost / $ sudo reboot
+</pre>
+ The <em>sudo reboot</em> command restarts your Chromebook.
+<p class="note"><strong>Note</strong>: You can press the <strong>Tab</strong>
+key to enable autocompletion of file names.</p>
+ </li>
+ <li>
+ After your device restarts, log in to your test account and type the
+ following command to enable the <em>secure shell</em> and configure the
+ firewall properly:
+<pre class="no-pretty-print">
+chronos@localhost / $ sudo /usr/libexec/debugd/helpers/dev_features_ssh
+</pre>
+ You can now exit out of the shell.
+ </li>
+</ol>
+
+<p class="note"><strong>Note</strong>: You must complete this procedure only
+once on your Chromebook.</p>
+
+<h3>Check the IP address of your Chromebook</h3>
+
+<p>
+To verify the IP address of your Chromebook, complete the following steps:
+</p>
+
+<ol>
+ <li>
+ Click the clock icon in the bottom-right area of the screen.
+ </li>
+ <li>
+ Click <strong>Settings</strong>.
+ </li>
+ <li>
+ The <em>Internet Connection</em> section in the Settings area lists all of
+ the available networks. Select the one that you want to use for ADB.
+ </li>
+ <li>
+ Take note of the IP address that appears.
+ </li>
+</ol>
+
+<h3>Enable ADB debugging</h3>
+
+<p>
+To enable ADB debugging, complete the following steps:
+</p>
+
+<ol>
+ <li>
+ Click the clock icon in the bottom-right area of the screen.
+ </li>
+ <li>
+ Click <strong>Settings</strong>.
+ </li>
+ <li>
+ In the <em>Android Apps</em> section, click the <strong>Settings</strong>
+ link in the line that reads <em>Manage your Android apps in Settings</em>.
+ This brings up the Android apps settings.
+ </li>
+ <li>
+ Click <strong>About device</strong>.
+ </li>
+ <li>
+ Click <strong>Build number</strong> seven times to move into Developer mode.
+ </li>
+ <li>
+ Click the arrow in the top-left area of the window to go back to the main
+ Settings screen.
+ </li>
+ <li>
+ Click the new <strong>Developer options</strong> item, activate <strong>ADB
+ debugging</strong>, and then click <strong>OK</strong> to allow ADB
+ debugging.
+ </li>
+ <li>
+ Return to your development machine and use ADB to connect to your
+ Chromebook's using its IP address and port 22.
+ </li>
+ <li>
+ On your Chromebook, click <strong>Allow</strong> when prompted whether you
+ want to allow the debugger. Your ADB session is established.
+ </li>
+</ol>
+
+<h4>Troubleshooting ADB debugging</h4>
+
+<p>
+Sometimes the ADB device shows that it's offline when everything is connected
+properly. In this case, complete the following steps to troubleshoot the issue:
+</p>
+
+<ol>
+ <li>
+ Deactivate <strong>ADB debugging</strong> in <em>Developer options</em>.
+ </li>
+ <li>
+ In a terminal window, run <code>adb kill-server</code>.
+ </li>
+ <li>
+ Re-activate the <strong>ADB debugging</strong> option.
+ </li>
+ <li>
+ In a terminal window, attempt to run <code>adb connect</code>.
+ </li>
+ <li>
+ Click <strong>Allow</strong> when prompted whether you want to allow
+ debugging. Your ADB session is established.
+ </li>
+</ol>
+
+<h2 id="learning-materials">Additional Learning Materials</h2>
+
+<p>
+To learn more about optimizing your Android apps for Chromebooks, consult the
+following resources:
+</p>
+
+<ul>
+ <li>
+ Review the
+ <a class="external-link" href="http://android-developers.blogspot.com/2016/05/bring-your-android-app-to-chromebooks.html">
+ Bring your Android App to Chromebooks</a> I/O session.
+ </li>
+ <li>
+ Post a question on the <a class="external-link"
+ href="https://plus.sandbox.google.com/+AndroidDevelopers">Android developer
+ community</a> with hashtag <em>#AndroidAppsOnChromeOS</em>.
+ </li>
+</ul>
diff --git a/docs/html/topic/arc/manifest.jd b/docs/html/topic/arc/manifest.jd
new file mode 100644
index 0000000..7d18665
--- /dev/null
+++ b/docs/html/topic/arc/manifest.jd
@@ -0,0 +1,341 @@
+page.title=App Manifest Compatibility for Chromebooks
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>On this page</h2>
+
+ <ol>
+ <li><a href="#incompat-entries">Incompatible Manifest Entries</a></li>
+ <li>
+ <a href="#implied-features">Permissions That Imply Feature
+ Requirements</a>
+ </li>
+ </ol>
+ </div>
+ </div>
+
+<p>
+As you prepare your Android app to run on Chromebooks, you should consider the
+device features that your app uses. Chromebooks don't support all of the
+hardware and software features that are available on other devices running
+Android. If your app requires specific features that aren't supported on
+Chromebooks, it won't be available for installation on Chromebooks.
+</p>
+
+<p>
+You declare your app's requirements for hardware features and certain software
+features in the <a
+href="{@docRoot}guide/topics/manifest/manifest-intro.html">manifest file</a>.
+This document describes the app manifest feature declarations that aren't
+compatible with Chromebooks.
+</p>
+
+<h2 id="incompat-entries">Incompatible Manifest Entries</h2>
+
+<p>
+The manifest entries listed in this section aren't currently compatible with
+Chromebooks. If your app uses any of these entries, consider removing them or
+including the <code>required="false"</code> attribute value with them so that
+your app can be installed on Chromebooks. For more information about declaring
+feature use without requiring that the feature be available on the device, see
+the guide for the <a
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html#market-feature-filtering">
+<code><uses-feature></code></a> manifest element.
+</p>
+
+<p class="note"><strong>Note</strong>: See the <a
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html#features-reference">
+Features Reference</a> for a complete list of app manifest features and
+descriptions.
+</p>
+
+<h3 id="incompat-hardware-features">Hardware features</h3>
+
+<p>
+Support for hardware features varies on Chromebooks. Some features aren't
+supported on any Chromebooks while others are supported on some Chromebooks.
+</p>
+
+<h4>Unsupported hardware features</h4>
+
+<p>
+The following list includes the hardware features that aren't currently
+supported on Chromebooks:
+</p>
+
+<ul>
+ <li>
+ <code>android.hardware.camera</code> – Back-facing camera
+ </li>
+ <li>
+ <code>android.hardware.camera.autofocus</code> – Camera that uses
+ autofocus
+ </li>
+ <li>
+ <code>android.hardware.camera.capability.manual_post_processing</code>
+ – Camera that uses the <code>MANUAL_POST_PROCESSING</code> feature,
+ including functionality for overriding auto white balance
+ </li>
+ <li>
+ <code>android.hardware.camera.capability.manual_sensor</code> – Camera
+ that uses the <code>MANUAL_SENSOR</code> feature, including auto-exposure
+ locking support
+ </li>
+ <li>
+ <code>android.hardware.camera.capability.raw</code> – Camera that uses
+ the <code>RAW</code> feature, including the ability to save DNG (raw) files
+ and provide DNG-related metadata
+ </li>
+ <li>
+ <code>android.hardware.camera.flash</code> – Camera that uses flash
+ </li>
+ <li>
+ <code>android.hardware.camera.level.full</code> – Camera that uses
+ <code>FULL</code>-level image-capturing support
+ </li>
+ <li>
+ <code>android.hardware.consumerir</code> – Infrared (IR)
+ </li>
+ <li>
+ <code>android.hardware.location.gps</code> – GPS
+ </li>
+ <li>
+ <code>android.hardware.nfc</code> – Near-Field Communication (NFC)
+ </li>
+ <li>
+ <code>android.hardware.nfc.hce</code> – NFC card emulation
+ (<em>deprecated</em>)
+ </li>
+ <li>
+ <code>android.hardware.sensor.barometer</code> – Barometer (air
+ pressure)
+ </li>
+ <li>
+ <code>android.hardware.telephony</code> – Telephony, including radio
+ with data communication services
+ </li>
+ <li>
+ <code>android.hardware.telephony.cdma</code> – Telephony Code Division
+ Multiple Access (CDMA) network support
+ </li>
+ <li>
+ <code>android.hardware.telephony.gsm</code> – Telephony Global System
+ for Mobile Communications (GSM) network support
+ </li>
+ <li>
+ <code>android.hardware.type.automotive</code> – Android Auto user
+ interface
+ </li>
+ <li>
+ <code>android.hardware.type.television</code> – Television
+ (<em>deprecated</em>)
+ <li>
+ <code>android.hardware.usb.accessory</code> – USB accessory mode
+ </li>
+ <li>
+ <code>android.hardware.usb.host</code> – USB host mode
+ </li>
+</ul>
+
+<h4>Partially-supported hardware features</h4>
+
+<p>
+The following list includes the hardware features that may be available on some
+Chromebooks:
+</p>
+
+<ul>
+ <li>
+ <code>android.hardware.sensor.accelerometer</code> – Accelerometer
+ (device orientation)
+ </li>
+ <li>
+ <code>android.hardware.sensor.compass</code> – Compass
+ </li>
+ <li>
+ <code>android.hardware.sensor.gyroscope</code> – Gyroscope (device
+ rotation and twist)
+ </li>
+ <li>
+ <code>android.hardware.sensor.light</code> – Light
+ </li>
+ <li>
+ <code>android.hardware.sensor.proximity</code> – Proximity (to user)
+ </li>
+ <li>
+ <code>android.hardware.sensor.stepcounter</code> – Step counter
+ </li>
+ <li>
+ <code>android.hardware.sensor.stepdetector</code> – Step detector
+ </li>
+</ul>
+
+<h4>Touchscreen hardware support</h4>
+
+<p>
+As of Chrome OS version M53, all Android apps that don't explicitly require the
+<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features">
+<code>android.hardware.touchscreen</code></a> feature will also work on Chrome
+OS devices that support the <a
+href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features">
+<code>android.hardware.faketouch</code></a> feature. Devices that have fake
+touch interfaces provide a user input system that emulates basic touch events.
+For example, the user could interact with a mouse or remote control to move an
+on-screen cursor, scroll through a list, and drag elements from one part of the
+screen to another.
+</p>
+
+<p>
+If you don't want your app to be installed on devices that have fake touch
+interfaces but not touchscreens, you can complete one of the following actions:
+</p>
+
+<ul>
+ <li>Exclude specific devices in the <a class="external-link"
+ href="https://play.google.com/apps/publish">Google Play Developer Console.</a>
+ </li>
+ <li>Filter devices with no touchscreen hardware by explicitly declaring <a
+ href="{@docRoot}guide/topics/manifest/uses-feature-element.html#touchscreen-hw-features">
+ <code>android.hardware.touchscreen</code></a> as being required in order to
+ install your app.</li>
+</ul>
+
+<h3 id="incompat-software-features">Software features</h3>
+
+<p>
+The following list includes the software features that aren't currently
+supported on Chromebooks:
+</p>
+
+<ul>
+ <li>
+ <code>android.software.app_widgets</code> – App Widgets on the Home
+ screen
+ </li>
+ <li>
+ <code>android.software.device_admin</code> – Device policy
+ administration
+ </li>
+ <li>
+ <code>android.software.home_screen</code> – Replaces device's Home
+ screen
+ </li>
+ <li>
+ <code>android.software.input_methods</code> – Custom input methods
+ (instances of <a href="{@docRoot}reference/android/inputmethodservice/InputMethodService.html">
+ <code>InputMethodService</code></a>)
+ </li>
+ <li>
+ <code>android.software.leanback</code> – UI designed for large-screen
+ viewing
+ </li>
+ <li>
+ <code>android.software.live_wallpaper</code> – Animated wallpapers
+ </li>
+ <li>
+ <code>android.software.live_tv</code> – Streaming live TV programs
+ </li>
+ <li>
+ <code>android.software.managed_users</code> – Secondary users and
+ managed profiles
+ </li>
+ <li>
+ <code>android.software.midi</code> – Musical Instrument Digital
+ Interface (MIDI) protocol, which supports connecting to musical instruments
+ and providing sound
+ </li>
+ <li>
+ <code>android.software.sip</code> – Session Initiation Protocol (SIP)
+ service, which supports video conferencing and instant messaging
+ </li>
+ <li>
+ <code>android.software.sip.voip</code> – Voice Over Internet Protocol
+ (VoIP) service based on SIP, which supports two-way video conferencing
+ </li>
+</ul>
+
+<h2 id="implied-features">Permissions That Imply Feature Requirements</h2>
+
+<p>
+Some permissions that you request in your manifest files can create implied
+requests for hardware and software features. By requesting these permissions,
+you'll prevent your app from being installed on Chromebooks.
+</p>
+
+<p>
+For details about how to prevent permission requests from making your app
+unavailable on Chromebooks, see the <a href="#incompat-entries">Incompatible
+Manifest Entries</a> section of this page.
+</p>
+
+<p>
+The following table shows the permissions that imply certain feature
+requirements which make an app incompatible with Chromebooks:
+</p>
+
+<p class="table-caption">
+<strong>Table 1. </strong>Device permissions that imply hardware features which
+are incompatible with Chromebooks.
+</p>
+
+<table>
+ <tr>
+ <th scope="col">Category</th>
+ <th scope="col">This Permission...</th>
+ <th scope="col">...Implies This Feature Requirement</th>
+ </tr>
+ <tr>
+ <td>Camera</td>
+ <td><code>CAMERA</code></td>
+ <td>
+ <code>android.hardware.camera</code> and<br>
+ <code>android.hardware.camera.autofocus</code>
+ </td>
+ </tr>
+ <tr>
+ <td rowspan="11">Telephony</td>
+ <td><code>CALL_PHONE</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>CALL_PRIVILEGED</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>MODIFY_PHONE_STATE</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>PROCESS_OUTGOING_CALLS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>READ_SMSREAD_SMS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>RECEIVE_SMS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>RECEIVE_MMS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>RECEIVE_WAP_PUSH</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>SEND_SMS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>WRITE_APN_SETTINGS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+ <tr>
+ <td><code>WRITE_SMS</code></td>
+ <td><code>android.hardware.telephony</code></td>
+ </tr>
+</table>
diff --git a/docs/html/topic/arc/sideload.jd b/docs/html/topic/arc/sideload.jd
new file mode 100644
index 0000000..dca84ff
--- /dev/null
+++ b/docs/html/topic/arc/sideload.jd
@@ -0,0 +1,125 @@
+page.title=Loading Apps on Chromebooks
+@jd:body
+
+<div id="qv-wrapper">
+ <div id="qv">
+ <h2>On this page</h2>
+
+ <ol>
+ <li><a href="#enter-dev">Enter Developer Mode</a></li>
+ <li><a href="#enable-unknown">Enable Unknown Sources</a></li>
+ <li><a href="#load-app">Load Your App</a></li>
+ </ol>
+ </div>
+ </div>
+
+<p>
+This document describes how to enter <em>Developer</em> mode and enable
+<em>unknown resources</em> so that you can load Android apps on your Google
+Chromebook.
+</p>
+
+<h2 id="enter-dev">Enter Developer Mode</h2>
+
+<p>
+To load Android apps, you must enable unknown sources. Enabling unknown sources
+is available only when your device is in Developer mode.
+</p>
+
+<p class="caution"><strong>Caution: </strong>Modifications that you make to the
+system are not supported by Google and may void your warranty. Additionally,
+modifications may cause hardware, software, or security issues.
+</p>
+
+<p class="note"><strong>Note: </strong>On most devices, both the
+<em>recovery</em> button and the <em>dev-switch</em> button are virtualized. If
+these instructions don't work for you, see the <a class="external-link"
+href="https://www.chromium.org/chromium-os/developer-information-for-chrome-os-devices">
+specific instructions for your device</a>.
+</p>
+
+<p>
+To enter Developer mode, complete these steps:
+</p>
+
+<ol>
+ <li>
+ Invoke <em>Recovery</em> mode by pressing and holding the
+ <strong>Esc</strong> and <strong>Refresh (F3)</strong> keys, then pressing
+ the <strong>Power</strong> button.
+ </li>
+ <li>
+ When the <em>Recovery</em> screen appears, press <strong>Ctrl+D</strong>.
+ There's no prompt for this action, so you must simply complete it.
+ Afterwards, you are prompted to confirm and reboot into Developer mode.
+ </li>
+</ol>
+
+<p>
+If you see one of the following screens when you turn on your device, you've
+successfully entered Developer mode:
+</p>
+
+<img src="{@docRoot}images/topic/arc/sideload_figure_1.jpg" />
+
+<p class="img-caption"><strong>Figure 1. </strong>Developer mode confirmation
+screens.</p>
+
+<p class="note"><strong>Note</strong>: To skip the OS loading screen, either
+wait 30 seconds or press <strong>Ctrl+D</strong>, and your Chromebook continues
+starting.
+</p>
+
+<h2 id="enable-unknown">Enable Unknown Sources</h2>
+
+<p>
+To enable unknown sources, navigate to <strong>Chrome Settings > App Settings >
+Security</strong>, then enable <strong>Unknown sources</strong> by moving the
+slider to the right.
+</p>
+
+<p class="note"><strong>Note:</strong>You can enable unknown sources only when
+your device is in <a
+href="{@docRoot}topic/arc/sideload.html#enter-dev">Developer mode</a>.
+</p>
+
+<h2 id="load-app">Load Your App</h2>
+
+<p>
+After enabling unknown sources, you can load apps by copying an app's APK file
+to the <em>Downloads</em> folder and opening it with Android's File Manager app.
+
+</p>
+
+<p>
+You can copy the APK file to your Chromebook using one of the following methods:
+</p>
+
+<ul>
+ <li>
+ <strong>Using a cloud app</strong> – Upload your APK file to Google
+ Drive or send it to yourself via email. Open it with the Android app
+ equivalent (Drive and Gmail, respectively).
+ </li>
+ <li>
+ <strong>Using an external storage device</strong> – Transfer the APK
+ file to the Downloads folder of your Chromebook using a thumb drive, SD
+ card, or an external hard drive. Afterwards, open the Android File Manager
+ app by navigating to <strong>Chrome Settings > App Settings > Device &
+ USB > Explore</strong>.
+ </li>
+ <li>
+ <strong>Using ADB</strong> – After <a
+ href="{@docRoot}topic/arc/index.html#setup"> setting up ADB</a> on your
+ Chromebook, enter the following command into a terminal window on your
+ development workstation:
+<pre class="no-pretty-print">
+adb install <var>app-name</var>.apk
+</pre>
+ <p>This command pushes the app to your connected Chromebook and installs the
+ app. For more information about copying and installing apps from a
+ development computer, see <a
+ href="{@docRoot}studio/command-line/adb.html#move">Installing an
+ Application</a>.</p>
+ </li>
+</ul>
diff --git a/docs/html/topic/libraries/data-binding/index.jd b/docs/html/topic/libraries/data-binding/index.jd
index 454bb59..ddcc9f2 100644
--- a/docs/html/topic/libraries/data-binding/index.jd
+++ b/docs/html/topic/libraries/data-binding/index.jd
@@ -601,7 +601,7 @@
<import type="com.example.User"/>
<import type="java.util.List"/>
<variable name="user" type="User"/>
- <variable name="userList" type="List<User>"/>
+ <variable name="userList" type="List&lt;User&gt;"/>
</data>
</pre>
<p class="caution">
@@ -945,9 +945,9 @@
<import type="android.util.SparseArray"/>
<import type="java.util.Map"/>
<import type="java.util.List"/>
- <variable name="list" type="List<String>"/>
- <variable name="sparse" type="SparseArray<String>"/>
- <variable name="map" type="Map<String, String>"/>
+ <variable name="list" type="List&lt;String&gt;"/>
+ <variable name="sparse" type="SparseArray&lt;String&gt;"/>
+ <variable name="map" type="Map&lt;String, String&gt;"/>
<variable name="index" type="int"/>
<variable name="key" type="String"/>
</data>
@@ -1247,7 +1247,7 @@
<pre>
<data>
<import type="android.databinding.ObservableMap"/>
- <variable name="user" type="ObservableMap<String, Object>"/>
+ <variable name="user" type="ObservableMap&lt;String, Object&gt;"/>
</data>
…
<TextView
@@ -1277,7 +1277,7 @@
<data>
<import type="android.databinding.ObservableList"/>
<import type="com.example.my.app.Fields"/>
- <variable name="user" type="ObservableList<Object>"/>
+ <variable name="user" type="ObservableList&lt;Object&gt;"/>
</data>
…
<TextView
diff --git a/docs/html/training/_book.yaml b/docs/html/training/_book.yaml
index 8ca70a3..d709586 100644
--- a/docs/html/training/_book.yaml
+++ b/docs/html/training/_book.yaml
@@ -1373,6 +1373,11 @@
path_attributes:
- name: description
value: How to use the SafetyNet service to analyze a device where your app is running and get information about its compatibility with your app.
+ - title: Checking URLs with the Safe Browsing API
+ path: /training/safebrowsing/index.html
+ path_attributes:
+ - name: description
+ value: How to use the SafetyNet service to determine if a URL is designated as a known threat.
- title: Enhancing Security with Device Management Policies
path: /work/device-management-policy.html
path_attributes:
diff --git a/docs/html/training/safebrowsing/index.jd b/docs/html/training/safebrowsing/index.jd
new file mode 100644
index 0000000..c6c72bf
--- /dev/null
+++ b/docs/html/training/safebrowsing/index.jd
@@ -0,0 +1,315 @@
+page.title=Checking URLs with the Safe Browsing API
+
+@jd:body
+
+
+<div id="tb-wrapper">
+ <div id="tb">
+ <h2>
+ In this document
+ </h2>
+
+ <ol>
+ <li>
+ <a href="#tos">Terms of Service</a>
+ </li>
+
+ <li>
+ <a href="#api-key">Requesting and Registering an Android API Key</a>
+ <ol>
+ <li>
+ <a href="#manifest">Adding the Android API to your
+ AndroidManifest.xml</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#connect-google-play">Connect to Google Play Services</a>
+ </li>
+
+ <li>
+ <a href="#url-check">Requesting a URL Check</a>
+ <ol>
+ <li>
+ <a href="#threat-types">Specifying threat types of interest</a>
+ </li>
+
+ <li>
+ <a href="#url-check-request">Send the URL check request</a>
+ </li>
+
+ <li>
+ <a href="#url-check-response">Read the URL check response</a>
+ </li>
+ </ol>
+ </li>
+
+ <li>
+ <a href="#warning-lang">Suggested Warning Language</a>
+ </li>
+ </ol>
+ </div>
+</div>
+
+<p>
+ SafetyNet provides services for determining whether a URL has been marked as
+ a known threat by Google.
+</p>
+
+<p>
+ The service provides an API your app can use to determine whether a
+ particular URL has been classified by Google as a known threat. Internally,
+ SafetyNet implements a client for the Safe Browsing Network Protocol v4
+ developed by Google. Both the client code and the v4 network protocol were
+ designed to preserve users' privacy, as well as keep battery and bandwidth
+ consumption to a minimum. This API allows you to take full advantage of
+ Google's Safe Browsing service on Android in the most resource-optimized way,
+ and without having to implement its network protocol.
+</p>
+
+<p>
+ This document shows you how to use SafetyNet for checking a URL for threat
+ types of interest.
+</p>
+
+<h2 id="tos">
+ Terms of Service
+</h2>
+
+<p>
+ By using the Safe Browsing API, you consent to be bound by the <a href=
+ "https://developers.google.com/safe-browsing/terms">Terms of Service</a>.
+ Please read and understand all applicable terms and policies before accessing
+ the Safe Browsing API.
+</p>
+
+<h2 id="api-key">
+ Requesting and Registering an Android API Key
+</h2>
+
+<p>
+ To create an API key, complete the following steps:
+</p>
+
+<ol>
+ <li>Go to the <a href="https://console.developers.google.com/project"
+ class="external-link">Google Developers Console</a>.
+ </li>
+
+ <li>On the upper toolbar, choose <strong>Select a project >
+ <em>your-project-name</em></strong>.
+ </li>
+
+ <li>In the search box, enter <em>Safe Browsing APIs</em>; when the Safe
+ Browsing API name appears in the table, select it.
+ </li>
+
+ <li>After the page redisplays, select <strong>Enable</strong> then select
+ <strong>Go to Credentials</strong>.
+ </li>
+
+ <li>When the <em>Add credentials to your project</em> window appears, choose
+ your parameters then select <strong>What credentials do I need?</strong>.
+ </li>
+
+ <li>Enter a name for your API key then select <strong>Create API
+ key</strong>.
+ </li>
+
+ <li>
+ <p>
+ Your new API key appears; copy and paste this key for future use.
+ </p>
+
+ <p class="note">
+ <strong>Note:</strong> Your API key allows you to perform a URL check
+ 10,000 times each day. The key, in this instance, should just be a
+ hexadecimal string, not part of a URL.
+ </p>
+ </li>
+
+ <li>Select <strong>Done</strong> to complete the process.
+ </li>
+</ol>
+
+<p>
+ If you need more help, check out the <a href=
+ "https://developers.google.com/console/help/new/">Google Developers Console
+ Help Center</a>.
+</p>
+
+<h3 id="manifest">
+ Adding the Android API key to your AndroidManifest.xml
+</h3>
+
+<p>
+ Once your key has been whitelisted, you need to add the key to the
+ <code>AndroidManifest.xml</code> file for your app:
+</p>
+
+<pre>
+<application>
+
+ ...
+
+ <!-- SafetyNet API metadata -->
+ <meta-data android:name="com.google.android.safetynet.API_KEY"
+ android:value="<var>your-API-key</var>" />
+
+ ...
+
+</application>
+</pre>
+<h2 id="connect-google-play">
+ Connect to Google Play Services
+</h2>
+
+<p>
+ The SafetyNet API is part of Google Play services. To connect to the API, you
+ need to create an instance of the Google Play services API client. For
+ details about using the client in your app, see <a href=
+ "https://developers.google.com/android/guides/api-client#Starting">Accessing
+ Google APIs</a>. Once you have established a connection to Google Play
+ services, you can use the Google API client classes to connect to the
+ SafetyNet API.
+</p>
+
+<p>
+ To connect to the API, in your activity's <code><a href=
+ "{@docRoot}reference/android/app/Activity.html#onCreate(android.os.Bundle)">onCreate()</a></code>
+ method, create an instance of Google API Client using <code><a href=
+ "https://developers.google.com/android/reference/com/google/android/gms/common/api/GoogleApiClient.Builder">
+ GoogleApiClient.Builder</a></code>. Use the builder to add the SafetyNet API,
+ as shown in the following code example:
+</p>
+
+<pre>
+protected synchronized void buildGoogleApiClient() {
+ mGoogleApiClient = new GoogleApiClient.Builder(this)
+ .addApi(SafetyNet.API)
+ .addConnectionCallbacks(myMainActivity.this)
+ .build();
+}
+</pre>
+<p class="note">
+ <strong>Note:</strong> You can only call these methods after your app has
+ established a connection to Google Play services by receiving the <code>
+ <a href="https://developers.google.com/android/reference/com/google/android/gms/common/api/GoogleApiClient.ConnectionCallbacks#public-methods">
+ onConnected()</a></code> callback. For details about listening for a completed
+ client connection, see <a href=
+ "https://developers.google.com/android/guides/api-client#Starting">Accessing
+ Google APIs</a>.
+</p>
+
+<h2 id="url-check">
+ Requesting a URL Check
+</h2>
+
+<p>
+ A URL check allows your app to determine if a URL has been marked as a threat
+ of interest. Some threat types may not be of interest to your particular
+ app, and the API allows you to choose which threat types are important for
+ your needs. You can specify multiple threat types of interest.
+</p>
+
+<h3 id="threat-types">
+ Specifying threat types of interest
+</h3>
+
+<p>
+ The constants in the {@code SafeBrowsingThreat} class contain the
+ currently-supported threat types:
+</p>
+
+<pre>
+package com.google.android.gms.safetynet;
+
+public class SafeBrowsingThreat {
+
+ /**
+ * This threat type identifies URLs of pages that are flagged as containing potentially
+ * harmful applications.
+ */
+ public static final int TYPE_POTENTIALLY_HARMFUL_APPLICATION = 4;
+
+ /**
+ * This threat type identifies URLs of pages that are flagged as containing social
+ * engineering threats.
+ */
+ public static final int TYPE_SOCIAL_ENGINEERING = 5;
+}
+</pre>
+<p>
+ When using the API, you must use constants that are not marked as deprecated.
+ You add threat type constants as arguments to the API. You may add as many
+ threat type constants as is required for your app.
+</p>
+
+<h3 id="url-check-request">
+ Send the URL check request
+</h3>
+
+<p>
+ The API is agnostic to the scheme used, so you can pass the URL with or
+ without a scheme. For example, either
+</p>
+
+<pre>
+String url = "https://www.google.com";
+</pre>
+<p>
+ or
+</p>
+
+<pre>
+String url = "www.google.com";
+</pre>
+<p>
+ is valid.
+</p>
+
+<pre>
+SafetyNet.SafetyNetApi.lookupUri(mGoogleApiClient, url,
+ SafeBrowsingThreat.TYPE_POTENTIALLY_HARMFUL_APPLICATION,
+ SafeBrowsingThreat.TYPE_SOCIAL_ENGINEERING)
+ .setResultCallback(
+ new ResultCallback<SafetyNetApi.SafeBrowsingResult>() {
+
+ @Override
+ public void onResult(SafetyNetApi.SafeBrowsingResult result) {
+ Status status = result.getStatus();
+ if ((status != null) && status.isSuccess()) {
+ // Indicates communication with the service was successful.
+ // Identify any detected threats.
+ if (result.getDetectedThreats().isEmpty()) {
+
+ }
+ } else {
+ // An error occurred. Let the user proceed without warning.
+ }
+ }
+});
+</pre>
+<h3 id="url-check-response">
+ Read the URL check response
+</h3>
+
+<p>
+ The result is provided as a list of {@code SafeBrowsingThreat} objects by
+ calling the {@code SafetyNetApi.SafeBrowsingResult.getDetectedThreats()}
+ method of the returned {@code SafetyNetApi.SafeBrowsingResult} object. If the
+ list is empty, no threats were detected; otherwise, calling {@code
+ SafeBrowsingThreat.getThreatType()} on each element in the list enumerates
+ the threats that were detected.
+</p>
+
+<h2 id="warning-lang">
+ Suggested Warning Language
+</h2>
+
+<p>
+ Please see the Safe Browsing API Developer's Guide for <a href=
+ "https://developers.google.com/safe-browsing/v4/usage-limits#suggested--warning-language">
+ suggested warning language</a>.
+</p>
\ No newline at end of file
diff --git a/docs/html/wear/preview/api-overview.jd b/docs/html/wear/preview/api-overview.jd
index 4233624..0b3ac6b 100644
--- a/docs/html/wear/preview/api-overview.jd
+++ b/docs/html/wear/preview/api-overview.jd
@@ -45,19 +45,19 @@
<p>
The Android Wear Preview API is still in active development, but you can try
it now as part of the Wear 2.0 Developer Preview. The sections below
- highlight some of the new features for Wear developers.
+ highlight some of the new features for Android Wear developers.
</p>
<h2 id="ui">User Interface Improvements</h2>
-<p>The preview introduces powerful additions to the user interface, opening up
-exciting possibilities to developers.
-A complication is any feature in a watch face that displays more than hours and
-minutes. With the Complications API,
- watch faces can display extra information and separate apps can expose complication
- data.
-The navigation and action drawers provide users with new ways to interact with apps.
+<p>
+ The preview introduces powerful additions to the user interface, opening up
+ exciting possibilities to developers. A complication
+ is any feature in a watch face that displays more than hours and
+ minutes. With the Complications API, watch faces can display extra information
+ and separate apps can expose complication data. The navigation and action
+ drawers provide users with new ways to interact with apps.
</p>
@@ -69,8 +69,8 @@
A <a href=
"https://en.wikipedia.org/wiki/Complication_(horology)">complication</a> is a
feature of a watch face that displays more than hours and minutes, such as a
- battery indicator or a step counter. The Complications API helps watch face
- developers create these features visual features and data connections they
+ battery indicator or a step counter. The Complications API thus helps watch face
+ developers create visual features and the data connections they
require.
</p>
