diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-04-23 17:47:06 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-23 17:47:06 -0700 |
| commit | 57dc74c376c4456eb669523b68e3af4309209a86 (patch) | |
| tree | 3625c79d21a4efcbe99da9f35bd29202ca5965a1 /testapps | |
| parent | cf57e9d328bed8fb9d41f8b08ab247dd282d0056 (diff) | |
| parent | e6ec57d99bfda23f18ec7ec27022c5321b7368e5 (diff) | |
| download | sdk-57dc74c376c4456eb669523b68e3af4309209a86.zip sdk-57dc74c376c4456eb669523b68e3af4309209a86.tar.gz sdk-57dc74c376c4456eb669523b68e3af4309209a86.tar.bz2 | |
Merge changes I4f89b469,I33b49c9f,I425e7b75
* changes:
Revert the disable flag of the manifest merger to be enable instead.
Minor fixes in Ant.
Manifest merger in Ant build.
Diffstat (limited to 'testapps')
4 files changed, 17 insertions, 20 deletions
diff --git a/testapps/testProjectTest/app/AndroidManifest.xml b/testapps/testProjectTest/app/AndroidManifest.xml index 821ae78..41e6b82 100644 --- a/testapps/testProjectTest/app/AndroidManifest.xml +++ b/testapps/testProjectTest/app/AndroidManifest.xml @@ -9,15 +9,6 @@ <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" > - <activity - android:name="com.android.tests.testprojecttest.lib.LibActivity" - android:label="@string/app_name" > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> </application> </manifest>
\ No newline at end of file diff --git a/testapps/testProjectTest/lib/AndroidManifest.xml b/testapps/testProjectTest/lib/AndroidManifest.xml index f8cc83d..b8bc11c 100644 --- a/testapps/testProjectTest/lib/AndroidManifest.xml +++ b/testapps/testProjectTest/lib/AndroidManifest.xml @@ -6,4 +6,15 @@ <uses-sdk android:minSdkVersion="15" /> + <application> + <activity + android:name="com.android.tests.testprojecttest.lib.LibActivity" + android:label="@string/app_name" > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + </activity> + </application> + </manifest>
\ No newline at end of file diff --git a/testapps/testProjectTest/lib/res/values/strings.xml b/testapps/testProjectTest/lib/res/values/strings.xml new file mode 100644 index 0000000..fdb2272 --- /dev/null +++ b/testapps/testProjectTest/lib/res/values/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <string name="app_name">TestProjectTest-lib</string> + +</resources>
\ No newline at end of file diff --git a/testapps/testProjectTest/testlib/AndroidManifest.xml b/testapps/testProjectTest/testlib/AndroidManifest.xml index acfe650..93b02e4 100644 --- a/testapps/testProjectTest/testlib/AndroidManifest.xml +++ b/testapps/testProjectTest/testlib/AndroidManifest.xml @@ -13,17 +13,6 @@ --> <application android:label="testProjectTest-testlib"> <uses-library android:name="android.test.runner" /> - - <activity - android:name="com.android.tests.testprojecttest.lib.LibActivity" - android:label="@string/app_name" > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> <!-- |