diff options
author | Raphael Moll <ralf@android.com> | 2010-11-22 12:39:47 -0800 |
---|---|---|
committer | Raphael Moll <ralf@android.com> | 2010-11-22 12:39:47 -0800 |
commit | a3dc674543cdbe7078c552b25ed33158b9ba3285 (patch) | |
tree | ad579d428581b45fa0325084854f3cd1b41e0132 | |
parent | 4bd402f5f1f15a7e9f13ae0104d32285113d780b (diff) | |
download | android_development-a3dc674543cdbe7078c552b25ed33158b9ba3285.tar.gz android_development-a3dc674543cdbe7078c552b25ed33158b9ba3285.tar.bz2 android_development-a3dc674543cdbe7078c552b25ed33158b9ba3285.zip |
Move <uses-sdk> before <application> in samples.
Change-Id: Iac2644d350235e19f5109aeb25a8d6d4eb1af3fe
-rw-r--r-- | samples/ContactManager/AndroidManifest.xml | 11 | ||||
-rwxr-xr-x | samples/JetBoy/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | samples/MultiResolution/AndroidManifest.xml | 8 | ||||
-rw-r--r-- | samples/NotePad/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | samples/SampleSyncAdapter/AndroidManifest.xml | 8 | ||||
-rw-r--r-- | samples/Spinner/AndroidManifest.xml | 10 | ||||
-rwxr-xr-x | samples/TicTacToeMain/AndroidManifest.xml | 5 | ||||
-rw-r--r-- | samples/Wiktionary/AndroidManifest.xml | 11 | ||||
-rw-r--r-- | samples/WiktionarySimple/AndroidManifest.xml | 6 |
9 files changed, 37 insertions, 30 deletions
diff --git a/samples/ContactManager/AndroidManifest.xml b/samples/ContactManager/AndroidManifest.xml index abf56695e..60fca32ad 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 bba069d4c..d0d41739d 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 4719069ec..0ebb55cd5 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 04f4dbee5..edd7dc78e 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 7f9f83bdf..202ed0e4b 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 f1accf8fe..719a022d9 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 54654f962..077eaa776 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 1641a8b0a..741874bca 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 c6b872486..b9935f4b3 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> |