LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of d7267fc2 to gingerbread-plus-aosp

Browse Source 
Change-Id: Id3b056cf13bcfa50b3b4a00a22b8f482069c04c9
This commit is contained in:
Raphael
2010-11-23 02:44:59 -08:00
parent 6e20b04ed0 d7267fc295
commit 0aa3856227
9 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/ContactManager/AndroidManifest.xml
View File

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

4
samples/JetBoy/AndroidManifest.xml
View File

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

8
samples/MultiResolution/AndroidManifest.xml
View File

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

4
samples/NotePad/AndroidManifest.xml
View File

@@ -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" >
<provider android:name="NotePadProvider"
@@ -107,6 +109,4 @@
</application>
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="4"/>
</manifest>

8
samples/SampleSyncAdapter/AndroidManifest.xml
View File

@@ -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>
</manifest>

10
samples/Spinner/AndroidManifest.xml
View File

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

5
samples/TicTacToeMain/AndroidManifest.xml
View File

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

11
samples/Wiktionary/AndroidManifest.xml
View File

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

6
samples/WiktionarySimple/AndroidManifest.xml
View File

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