diff options
Diffstat (limited to 'docs/html/guide/topics/manifest')
8 files changed, 8 insertions, 116 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 83237c6..c22d3e1 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -24,7 +24,7 @@ page.title=<activity> android:<a href="#proc">process</a>="<i>string</i>" android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" | "landscape" | "portrait" | - "sensor" | "nonsensor"] + "sensor" | "nosensor"] android:<a href="#state">stateNotNeeded</a>=["true" | "false"] android:<a href="#aff">taskAffinity</a>="<i>string</i>" android:<a href="#theme">theme</a>="<i>resource or theme</i>" @@ -687,7 +687,7 @@ Values set here (other than "{@code stateUnspecified}" and keyboard. Rather, the contents of the window are automatically panned so that the current focus is never obscured by the keyboard and users can always see what they are typing. This is generally less - desireable than resizing, because the user may need to close the soft + desirable than resizing, because the user may need to close the soft keyboard to get at and interact with obscured parts of the window.</td> </tr> </table> diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd index b48c5e0..b77fd05 100644 --- a/docs/html/guide/topics/manifest/data-element.jd +++ b/docs/html/guide/topics/manifest/data-element.jd @@ -28,7 +28,7 @@ attributes for each of its parts: These attributes are optional, but also mutually dependent: If a <code><a href="{@docRoot}guide/topics/manifest/data-element.html#scheme">scheme</a></code> is not specified for the intent filter, all the other URI attributes are ignored. If a -<code><a href="{@docRoot}guide/topics/manifest/data-element.html#host">host</a></code> is not specified for the filer, +<code><a href="{@docRoot}guide/topics/manifest/data-element.html#host">host</a></code> is not specified for the filter, the {@code port} attribute and all the path attributes are ignored. </p> diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index 89171c1..9e1b18d 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -112,7 +112,6 @@ other mention of the element name. <a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a> <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission /></a> - <a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission /></a> <a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data /></a> <a href="{@docRoot}guide/topics/manifest/provider-element.html"></provider></a> @@ -141,7 +140,6 @@ add your own elements or attributes. <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/path-permission-element.html"><path-permission /></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> diff --git a/docs/html/guide/topics/manifest/path-permission-element.jd b/docs/html/guide/topics/manifest/path-permission-element.jd deleted file mode 100644 index 5c271a7..0000000 --- a/docs/html/guide/topics/manifest/path-permission-element.jd +++ /dev/null @@ -1,104 +0,0 @@ -page.title=<path-permission> -@jd:body - -<dl class="xml"> -<dt>syntax:</dt> -<dd><pre class="stx"> -<path-permission android:<a href="#path">path</a>="<i>string</i>" - android:<a href="#pathPrefix">pathPrefix</a>="<i>string</i>" - android:<a href="#pathPattern">pathPattern</a>="<i>string</i>" - android:<a href="#permission">permission</a>="<i>string</i>" - android:<a href="#readPermission">readPermission</a>="<i>string</i>" - android:<a href="#writePermission">writePermission</a>="<i>string</i>" /> -</pre></dd> - -<dt>contained in:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code></dd> - -<!-- -<dt>can contain:</dt> -</dd> ---> - -<dt>description:</dt> -<dd>Defines the path and required permissions for a specific subset of data -within a content provider. This element can be -specified multiple times to supply multiple paths. - -</dd> - -<dt>attributes:</dt> - -<dd><dl class="attr"> -<dt><a name="path"></a>{@code android:path}</dt> -<dd>A complete URI path for a subset of content provider data. -Permission can be granted only to the particular data identified by this path. -When used to provide search suggestion content, it must be appended -with "/search_suggest_query". -</dd> - -<dt><a name="pathPrefix"></a>{@code android:pathPrefix}</dt> -<dd>The initial part of a URI path for a subset of content provider data. -Permission can be granted to all data subsets with paths that share this initial part. -</dd> - -<dt><a name="pathPattern"></a>{@code android:pathPattern}</dt> -<dd>A complete URI path for a subset of content provider data, -but one that can use the following wildcards: - -<ul> -<li>An asterisk ('<code class="Code prettyprint">*</code>'). This matches a sequence of 0 to many occurrences of -the immediately preceding character.</li> - -<li>A period followed by an asterisk ("<code class="Code prettyprint">.*</code>"). This matches any sequence of -0 or more characters.</li> -</ul> - -<p> -Because '<code class="Code prettyprint">\</code>' is used as an escape character when the string is read -from XML (before it is parsed as a pattern), you will need to double-escape. -For example, a literal '<code class="Code prettyprint">*</code>' would be written as "<code class="Code prettyprint">\\*</code>" and a -literal '<code class="Code prettyprint">\</code>' would be written as "<code class="Code prettyprint">\\</code>". This is basically -the same as what you would need to write if constructing the string in Java code. -</p> -<p> -For more information on these types of patterns, see the descriptions of -<a href="/reference/android/os/PatternMatcher.html#PATTERN_LITERAL">PATTERN_LITERAL</a>, -<a href="/reference/android/os/PatternMatcher.html#PATTERN_PREFIX">PATTERN_PREFIX</a>, and -<a href="/reference/android/os/PatternMatcher.html#PATTERN_SIMPLE_GLOB">PATTERN_SIMPLE_GLOB</a> in the -<a href="/reference/android/os/PatternMatcher.html">PatternMatcher</a> class. -</p> -</dd> - -<dt><a name="permission"></a>{@code android:permission}</dt> -<dd>The name of a permission that clients must have in order to read or write the -content provider's data. This attribute is a convenient way of setting a -single permission for both reading and writing. However, the -<code>readPermission</code> and -<code>writePermission</code> attributes take precedence -over this one. -</dd> - -<dt><a name="readPermission"></a>{@code android:readPermission}</dt> -<dd>A permission that clients must have in order to query the content provider. -</dd> - -<dt><a name="writePermission"></a>{@code android:writePermission}</dt> -<dd>A permission that clients must have in order to make changes to the data controlled by the content provider. -</dd> - - - -</dl></dd> - -<!-- ##api level indication## --> -<dt>introduced in:</dt> -<dd>API Level 4</dd> - -<dt>see also:</dt> -<dd>{@link android.app.SearchManager}</dd> -<dd>{@link android.Manifest.permission}</dd> -<dd><a href="/guide/topics/security/security.html">Security and -Permissions</a></dd> - -</dl> diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd index 3074354..aecc930 100644 --- a/docs/html/guide/topics/manifest/permission-tree-element.jd +++ b/docs/html/guide/topics/manifest/permission-tree-element.jd @@ -46,7 +46,7 @@ strings in the user interface.</dd> <dd>The name that's at the base of the permission tree. It serves as a prefix to all permission names in the tree. Java-style scoping should be used to ensure that the name is unique. The name must have more than -two period-separated seqments in its path — for example, +two period-separated segments in its path — for example, {@code com.example.base} is OK, but {@code com.example} is not.</dd> </dl></dd> diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd index 98892f1..c80b207 100644 --- a/docs/html/guide/topics/manifest/provider-element.jd +++ b/docs/html/guide/topics/manifest/provider-element.jd @@ -25,9 +25,7 @@ page.title=<provider> <dt>can contain:</dt> <dd><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-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/path-permission-element.html"><path-permission /></a></code> -</dd> +<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code></dd> <dt>description:</dt> <dd>Declares a content provider — a subclass of @@ -187,7 +185,7 @@ processes, and "{@code false}" if not. The default value is "{@code false}". Normally, a content provider is instantiated in the process of the application that defined it. However, if this flag is set to "{@code true}", the system can create an instance in every process where there's a client -that wants to interact withit, thus avoiding the overhead of interprocess +that wants to interact with it, thus avoiding the overhead of interprocess communication. </p></dd> diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd index 280d402..b208917 100644 --- a/docs/html/guide/topics/manifest/receiver-element.jd +++ b/docs/html/guide/topics/manifest/receiver-element.jd @@ -17,7 +17,7 @@ page.title=<receiver> <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> <dt>can contain:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filer></a></code> +<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></dd> <dt>description:</dt> diff --git a/docs/html/guide/topics/manifest/service-element.jd b/docs/html/guide/topics/manifest/service-element.jd index e5ac7b5..0a44e2c 100644 --- a/docs/html/guide/topics/manifest/service-element.jd +++ b/docs/html/guide/topics/manifest/service-element.jd @@ -17,7 +17,7 @@ page.title=<service> <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> <dt>can contain:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filer></a></code> +<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></dd> <dt>description:</dt> |