Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 218c0763: Merge change Ib43ec8f6 into eclair

Browse Source 
Merge commit '218c0763d5122ed975af7b9bd67e22def6364a23' into eclair-plus-aosp

* commit '218c0763d5122ed975af7b9bd67e22def6364a23':
  docs: fix some typos in the manifest docs samples and
This commit is contained in:
Scott Main
2009-12-16 10:28:11 -08:00
committed by Android Git Automerger
parent f016549595 218c0763d5
commit aaf8a9d885
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docs/html/guide/topics/manifest/activity-element.jd
View File

@@ -5,17 +5,17 @@ page.title=<activity>
<dt>syntax:</dt> <dt>syntax:</dt>
<dd><pre class="stx">&lt;activity android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"] <dd><pre class="stx">&lt;activity android:<a href="#reparent">allowTaskReparenting</a>=["true" | "false"]
android:<a href="#always">alwaysRetainTaskState</a>=["true" | "false"] android:<a href="#always">alwaysRetainTaskState</a>=["true" | "false"]
android:<a href="#clear">clearTaskOnLaunch</a>=["true"" | "false"] android:<a href="#clear">clearTaskOnLaunch</a>=["true" | "false"]
android:<a href="#config">configChanges</a>=[<i>one or more of</i>: "mcc" "mnc" "locale" android:<a href="#config">configChanges</a>=["mcc", "mnc", "locale",
"touchscreen" "keyboard" "keyboardHidden" "touchscreen", "keyboard", "keyboardHidden",
"navigation" "orientation" "fontScale"] "navigation", "orientation", "fontScale"]
android:<a href="#enabled">enabled</a>=["true" | "false"] android:<a href="#enabled">enabled</a>=["true" | "false"]
android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"] android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"]
android:<a href="#exported">exported</a>=["true" | "false"] android:<a href="#exported">exported</a>=["true" | "false"]
android:<a href="#finish">finishOnTaskLaunch</a>=["true" | "false"] android:<a href="#finish">finishOnTaskLaunch</a>=["true" | "false"]
android:<a href="#icon">icon</a>="<i>drawable resource</i>" android:<a href="#icon">icon</a>="<i>drawable resource</i>"
android:<a href="#label">label</a>="<i>string resource</i>" android:<a href="#label">label</a>="<i>string resource</i>"
android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" | android:<a href="#lmode">launchMode</a>=["multiple" | "singleTop" |
"singleTask" | "singleInstance"] "singleTask" | "singleInstance"]
android:<a href="#multi">multiprocess</a>=["true" | "false"] android:<a href="#multi">multiprocess</a>=["true" | "false"]
android:<a href="#nm">name</a>="<i>string</i>" android:<a href="#nm">name</a>="<i>string</i>"
@@ -23,16 +23,16 @@ page.title=&lt;activity&gt;
android:<a href="#prmsn">permission</a>="<i>string</i>" android:<a href="#prmsn">permission</a>="<i>string</i>"
android:<a href="#proc">process</a>="<i>string</i>" android:<a href="#proc">process</a>="<i>string</i>"
android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" | android:<a href="#screen">screenOrientation</a>=["unspecified" | "user" | "behind" |
"landscape" | "portrait" | "landscape" | "portrait" |
"sensor" | "nonsensor"] "sensor" | "nonsensor"]
android:<a href="#state">stateNotNeeded</a>=["true" | "false"] android:<a href="#state">stateNotNeeded</a>=["true" | "false"]
android:<a href="#aff">taskAffinity</a>="<i>string</i>" android:<a href="#aff">taskAffinity</a>="<i>string</i>"
android:<a href="#theme">theme</a>="<i>resource or theme</i>" android:<a href="#theme">theme</a>="<i>resource or theme</i>"
android:<a href="#wsoft">windowSoftInputMode</a>=[<i>one or more of</i>: "stateUnspecified" android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified",
"stateUnchanged" "stateHidden" "stateUnchanged", "stateHidden",
"stateAlwaysHidden" "stateVisible" "stateAlwaysHidden", "stateVisible",
"stateAlwaysVisible" "adjustUnspecified" "stateAlwaysVisible", "adjustUnspecified",
"adjustResize" "adjustPan"] &gt; <!-- ##api level 3## --> "adjustResize", "adjustPan"] &gt; <!-- ##api level 3## -->
. . . . . .
&lt;/activity&gt;</pre></dd> &lt;/activity&gt;</pre></dd>

2
docs/html/guide/topics/manifest/manifest-intro.jd
View File

@@ -445,7 +445,7 @@ element. For example, an activity could be protected as follows:
&lt;permission android:name="com.example.project.DEBIT_ACCT" . . . /&gt; &lt;permission android:name="com.example.project.DEBIT_ACCT" . . . /&gt;
. . . . . .
&lt;application . . .&gt; &lt;application . . .&gt;
&lt;activity android:name="com.example.project.FreneticActivity" . . . &gt; &lt;activity android:name="com.example.project.FreneticActivity"
android:permission="com.example.project.DEBIT_ACCT" android:permission="com.example.project.DEBIT_ACCT"
. . . &gt; . . . &gt;
. . . . . .