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

Commit 218c0763 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ib43ec8f6 into eclair 

* changes:
  docs: fix some typos in the manifest docs samples and remove the "one or more of" phrase from the syntax snippet because it interferes with the syntax coloring.
parents 9d2252db b43ec8f6

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

+12 −12
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ page.title=<activity> 
<dt>syntax:</dt>

<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="#clear">clearTaskOnLaunch</a>=["true"" | "false"]

          android:<a href="#config">configChanges</a>=[<i>one or more of</i>: "mcc" "mnc" "locale" 

                                 "touchscreen" "keyboard" "keyboardHidden" 

                                 "navigation" "orientation" "fontScale"]

          android:<a href="#clear">clearTaskOnLaunch</a>=["true" | "false"]

          android:<a href="#config">configChanges</a>=["mcc", "mnc", "locale",

                                 "touchscreen", "keyboard", "keyboardHidden",

                                 "navigation", "orientation", "fontScale"]

          android:<a href="#enabled">enabled</a>=["true" | "false"]

          android:<a href="#exclude">excludeFromRecents</a>=["true" | "false"]

          android:<a href="#exported">exported</a>=["true" | "false"]
@@ -28,11 +28,11 @@ page.title=&lt;activity&gt; 
          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>"

          android:<a href="#wsoft">windowSoftInputMode</a>=[<i>one or more of</i>: "stateUnspecified" 

                                       "stateUnchanged" "stateHidden" 

                                       "stateAlwaysHidden" "stateVisible" 

                                       "stateAlwaysVisible" "adjustUnspecified" 

                                       "adjustResize" "adjustPan"] &gt;   <!-- ##api level 3## -->

          android:<a href="#wsoft">windowSoftInputMode</a>=["stateUnspecified",

                                       "stateUnchanged", "stateHidden",

                                       "stateAlwaysHidden", "stateVisible",

                                       "stateAlwaysVisible", "adjustUnspecified",

                                       "adjustResize", "adjustPan"] &gt;   <!-- ##api level 3## -->

    . . .

&lt;/activity&gt;</pre></dd>

docs/html/guide/topics/manifest/manifest-intro.jd

+1 −1
Original line number Diff line number Diff line
@@ -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;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"

                  . . . &gt;

            . . .