Merge "Win SDK: Split the win-sdk makefile and script into 2 parts."
diff --git a/samples/ContactManager/AndroidManifest.xml b/samples/ContactManager/AndroidManifest.xml
index abf5669..60fca32 100644
--- a/samples/ContactManager/AndroidManifest.xml
+++ b/samples/ContactManager/AndroidManifest.xml
@@ -17,6 +17,12 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.contactmanager"
android:versionCode="1" android:versionName="1.0">
+
+ <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="5" />
+ <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+
<application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name=".ContactManager" android:label="@string/app_name">
<intent-filter>
@@ -26,10 +32,5 @@
</activity>
<activity android:name="ContactAdder" android:label="@string/addContactTitle">
</activity>
-
</application>
- <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="5" />
- <uses-permission android:name="android.permission.GET_ACCOUNTS" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
</manifest>
diff --git a/samples/JetBoy/AndroidManifest.xml b/samples/JetBoy/AndroidManifest.xml
index bba069d..d0d4173 100755
--- a/samples/JetBoy/AndroidManifest.xml
+++ b/samples/JetBoy/AndroidManifest.xml
@@ -20,6 +20,9 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.jetboy" android:versionCode="1"
android:versionName="1.0.0">
+
+ <uses-sdk android:minSdkVersion="3"></uses-sdk>
+
<application android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@android:style/Theme.NoTitleBar">
@@ -33,5 +36,4 @@
</intent-filter>
</activity>
</application>
- <uses-sdk android:minSdkVersion="3"></uses-sdk>
</manifest>
diff --git a/samples/MultiResolution/AndroidManifest.xml b/samples/MultiResolution/AndroidManifest.xml
index 4719069..0ebb55c 100644
--- a/samples/MultiResolution/AndroidManifest.xml
+++ b/samples/MultiResolution/AndroidManifest.xml
@@ -23,6 +23,10 @@
<uses-permission
android:name="android.permission.INTERNET"/>
+ <uses-sdk
+ android:minSdkVersion="3"
+ android:targetSdkVersion="4"/>
+
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name">
@@ -42,8 +46,4 @@
</application>
- <uses-sdk
- android:minSdkVersion="3"
- android:targetSdkVersion="4"/>
-
</manifest>
diff --git a/samples/NotePad/AndroidManifest.xml b/samples/NotePad/AndroidManifest.xml
index 04f4dbe..edd7dc7 100644
--- a/samples/NotePad/AndroidManifest.xml
+++ b/samples/NotePad/AndroidManifest.xml
@@ -22,6 +22,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.notepad"
>
+ <uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3"/>
+
<application android:icon="@drawable/app_notes"
android:label="@string/app_name"
>
@@ -110,6 +112,4 @@
</application>
- <uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3"/>
</manifest>
-
diff --git a/samples/SampleSyncAdapter/AndroidManifest.xml b/samples/SampleSyncAdapter/AndroidManifest.xml
index 7f9f83b..202ed0e 100644
--- a/samples/SampleSyncAdapter/AndroidManifest.xml
+++ b/samples/SampleSyncAdapter/AndroidManifest.xml
@@ -45,7 +45,9 @@
android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission
android:name="android.permission.WRITE_SYNC_SETTINGS" />
-
+
+ <uses-sdk android:minSdkVersion="5" />
+
<application
android:icon="@drawable/icon"
android:label="@string/label">
@@ -87,6 +89,4 @@
-->
</activity>
</application>
- <uses-sdk
- android:minSdkVersion="5" />
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/samples/Spinner/AndroidManifest.xml b/samples/Spinner/AndroidManifest.xml
index f1accf8..719a022 100644
--- a/samples/Spinner/AndroidManifest.xml
+++ b/samples/Spinner/AndroidManifest.xml
@@ -26,6 +26,12 @@
package="com.android.example.spinner"
android:versionCode="1"
android:versionName="1.0">
+
+ <!--
+ Requires a minimum platform version of Android-3 (SDK 1.5) to run
+ -->
+ <uses-sdk android:minSdkVersion="3"/>
+
<!--
Sets the application's user-readable label
-->
@@ -45,9 +51,5 @@
</activity>
</application>
- <!--
- Requires a minimum platform version of Android-3 (SDK 1.5) to run
- -->
- <uses-sdk android:minSdkVersion="3"/>
</manifest>
diff --git a/samples/TicTacToeMain/AndroidManifest.xml b/samples/TicTacToeMain/AndroidManifest.xml
index 54654f9..077eaa7 100755
--- a/samples/TicTacToeMain/AndroidManifest.xml
+++ b/samples/TicTacToeMain/AndroidManifest.xml
@@ -19,6 +19,9 @@
package="com.example.android.tictactoe"
android:versionCode="1"
android:versionName="1.0">
+
+ <uses-sdk android:minSdkVersion="8" />
+
<application android:icon="@drawable/icon" android:label="@string/app_name">
<activity android:name=".MainActivity"
android:label="@string/app_name">
@@ -34,6 +37,4 @@
</application>
- <uses-sdk android:minSdkVersion="8" />
-
</manifest>
diff --git a/samples/Wiktionary/AndroidManifest.xml b/samples/Wiktionary/AndroidManifest.xml
index 1641a8b..741874b 100644
--- a/samples/Wiktionary/AndroidManifest.xml
+++ b/samples/Wiktionary/AndroidManifest.xml
@@ -18,6 +18,12 @@
package="com.example.android.wiktionary"
android:versionCode="1"
android:versionName="1.0">
+
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
+
+ <meta-data android:name="android.app.default_searchable" android:value=".LookupActivity" />
+
<application android:icon="@drawable/app_icon" android:label="@string/app_name"
android:description="@string/app_descrip">
@@ -62,9 +68,4 @@
</application>
- <meta-data android:name="android.app.default_searchable" android:value=".LookupActivity" />
-
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
-
</manifest>
diff --git a/samples/WiktionarySimple/AndroidManifest.xml b/samples/WiktionarySimple/AndroidManifest.xml
index c6b8724..b9935f4 100644
--- a/samples/WiktionarySimple/AndroidManifest.xml
+++ b/samples/WiktionarySimple/AndroidManifest.xml
@@ -19,6 +19,9 @@
android:versionCode="1"
android:versionName="1.0">
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
+
<application android:icon="@drawable/app_icon" android:label="@string/app_name">
<!-- Broadcast Receiver that will process AppWidget updates -->
@@ -35,7 +38,4 @@
</application>
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />
-
</manifest>