Skip to content
This repository has been archived by the owner on Nov 8, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge "Move <uses-sdk> before <application> in samples."
  • Loading branch information
ralf-at-android authored and Android Code Review committed Nov 23, 2010
2 parents 4bd402f + a3dc674 commit d7267fc
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 30 deletions.
11 changes: 6 additions & 5 deletions samples/ContactManager/AndroidManifest.xml
Expand Up @@ -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>
Expand All @@ -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>
4 changes: 3 additions & 1 deletion samples/JetBoy/AndroidManifest.xml
Expand Up @@ -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">
Expand All @@ -33,5 +36,4 @@
</intent-filter>
</activity>
</application>
<uses-sdk android:minSdkVersion="3"></uses-sdk>
</manifest>
8 changes: 4 additions & 4 deletions samples/MultiResolution/AndroidManifest.xml
Expand Up @@ -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">
Expand All @@ -42,8 +46,4 @@

</application>

<uses-sdk
android:minSdkVersion="3"
android:targetSdkVersion="4"/>

</manifest>
4 changes: 2 additions & 2 deletions samples/NotePad/AndroidManifest.xml
Expand Up @@ -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"
>
Expand Down Expand Up @@ -110,6 +112,4 @@

</application>

<uses-sdk android:targetSdkVersion="4" android:minSdkVersion="3"/>
</manifest>

8 changes: 4 additions & 4 deletions samples/SampleSyncAdapter/AndroidManifest.xml
Expand Up @@ -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">
Expand Down Expand Up @@ -87,6 +89,4 @@
-->
</activity>
</application>
<uses-sdk
android:minSdkVersion="5" />
</manifest>
</manifest>
10 changes: 6 additions & 4 deletions samples/Spinner/AndroidManifest.xml
Expand Up @@ -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
-->
Expand All @@ -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>
5 changes: 3 additions & 2 deletions samples/TicTacToeMain/AndroidManifest.xml
Expand Up @@ -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">
Expand All @@ -34,6 +37,4 @@


</application>
<uses-sdk android:minSdkVersion="8" />

</manifest>
11 changes: 6 additions & 5 deletions samples/Wiktionary/AndroidManifest.xml
Expand Up @@ -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">

Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions samples/WiktionarySimple/AndroidManifest.xml
Expand Up @@ -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 -->
Expand All @@ -35,7 +38,4 @@

</application>

<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4" />

</manifest>

0 comments on commit d7267fc

Please sign in to comment.