summaryrefslogtreecommitdiffstats
path: root/docs/html/resources/tutorials
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-12-14 16:26:32 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-14 16:26:32 -0800
commit0b0eb1ac112d6500cae7bb0b9c46df8463cf90eb (patch)
tree1705f07b0de46df4e8b5987b03851466f5275858 /docs/html/resources/tutorials
parente464fba4a4bbaef40b6b1a4c0f06969484c38edb (diff)
parent178d500551c1d88a2e8ec9425d9cbfbb7d998113 (diff)
downloadframeworks_base-0b0eb1ac112d6500cae7bb0b9c46df8463cf90eb.zip
frameworks_base-0b0eb1ac112d6500cae7bb0b9c46df8463cf90eb.tar.gz
frameworks_base-0b0eb1ac112d6500cae7bb0b9c46df8463cf90eb.tar.bz2
am 178d5005: am b94df620: cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
* commit '178d500551c1d88a2e8ec9425d9cbfbb7d998113': cherrypick Change-Id: I653e91a47979b24e7ecfcbce013c4ffaaa3c55ee docs: edit manifest samples to indicate <application> element is always last
Diffstat (limited to 'docs/html/resources/tutorials')
-rw-r--r--docs/html/resources/tutorials/testing/activity_test.jd8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/resources/tutorials/testing/activity_test.jd b/docs/html/resources/tutorials/testing/activity_test.jd
index 87dd183..ec878d2 100644
--- a/docs/html/resources/tutorials/testing/activity_test.jd
+++ b/docs/html/resources/tutorials/testing/activity_test.jd
@@ -368,14 +368,14 @@ page.title=Activity Testing
package="com.android.example.spinner.test"
android:versionCode="1"
android:versionName="1.0"&gt;
- &lt;application android:icon="@drawable/icon" android:label="@string/app_name"&gt;
-
- &lt;uses-library android:name="android.test.runner" /&gt;
- &lt;/application&gt;
&lt;uses-sdk android:minSdkVersion="3" /&gt;
&lt;instrumentation
android:targetPackage="com.android.example.spinner"
android:name="android.test.InstrumentationTestRunner" /&gt;
+ &lt;application android:icon="@drawable/icon" android:label="@string/app_name"&gt;
+ &lt;uses-library android:name="android.test.runner" /&gt;
+ ...
+ &lt;/application&gt;
&lt;/manifest&gt;
</pre>
<p>