diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 83237c61dd5b3..5362dd8b50f30 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -5,17 +5,17 @@ page.title=<activity>
syntax:
<activity android:allowTaskReparenting=["true" | "false"]
           android:alwaysRetainTaskState=["true" | "false"]
-          android:clearTaskOnLaunch=["true"" | "false"]
-          android:configChanges=[one or more of: "mcc" "mnc" "locale" 
-                                 "touchscreen" "keyboard" "keyboardHidden" 
-                                 "navigation" "orientation" "fontScale"]
+          android:clearTaskOnLaunch=["true" | "false"]
+          android:configChanges=["mcc", "mnc", "locale",
+                                 "touchscreen", "keyboard", "keyboardHidden",
+                                 "navigation", "orientation", "fontScale"]
           android:enabled=["true" | "false"]
           android:excludeFromRecents=["true" | "false"]
           android:exported=["true" | "false"]
           android:finishOnTaskLaunch=["true" | "false"]
           android:icon="drawable resource"
           android:label="string resource"
-          android:launchMode=["multiple" | "singleTop" | 
+          android:launchMode=["multiple" | "singleTop" |
                               "singleTask" | "singleInstance"]
           android:multiprocess=["true" | "false"]
           android:name="string"
@@ -23,16 +23,16 @@ page.title=<activity>
           android:permission="string"
           android:process="string"
           android:screenOrientation=["unspecified" | "user" | "behind" |
-                                     "landscape" | "portrait" | 
+                                     "landscape" | "portrait" |
                                      "sensor" | "nonsensor"]
           android:stateNotNeeded=["true" | "false"]
           android:taskAffinity="string"
-          android:theme="resource or theme" 
-          android:windowSoftInputMode=[one or more of: "stateUnspecified" 
-                                       "stateUnchanged" "stateHidden" 
-                                       "stateAlwaysHidden" "stateVisible" 
-                                       "stateAlwaysVisible" "adjustUnspecified" 
-                                       "adjustResize" "adjustPan"] >   
+          android:theme="resource or theme"
+          android:windowSoftInputMode=["stateUnspecified",
+                                       "stateUnchanged", "stateHidden",
+                                       "stateAlwaysHidden", "stateVisible",
+                                       "stateAlwaysVisible", "adjustUnspecified",
+                                       "adjustResize", "adjustPan"] >   
     . . .
 </activity>
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index 89171c1d42f1d..c3e4a99584e52 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -445,7 +445,7 @@ element. For example, an activity could be protected as follows: <permission android:name="com.example.project.DEBIT_ACCT" . . . /> . . . <application . . .> - <activity android:name="com.example.project.FreneticActivity" . . . > + <activity android:name="com.example.project.FreneticActivity" android:permission="com.example.project.DEBIT_ACCT" . . . > . . .