Merge "Move <uses-sdk> before <application> in samples."

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>

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>

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>

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>
-

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
+</manifest>
-        android:minSdkVersion="5" />
-</manifest>

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>

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>

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>

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>