Merge change 27326 into eclair

[android-x86/packages-apps-Calendar.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 87a5f12..064f8ae 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,9 +24,11 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE"/>
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
     <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
 
     <application android:name="CalendarApplication"
@@ -37,8 +39,7 @@
         <uses-library android:name="android.test.runner" />
 
         <activity android:name="LaunchActivity"
-            android:theme="@android:style/Theme.Light"
-            android:clearTaskOnLaunch="true">
+            android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -57,7 +58,7 @@
             android:exported="true" />
         
         <activity android:name="EditEvent" android:label="@string/event_edit_title"
-            android:theme="@android:style/Theme.Light"
+            android:theme="@android:style/Theme"
             android:configChanges="orientation|keyboardHidden">
             
             <intent-filter>
@@ -78,7 +79,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/event_info_title"
+        <activity android:name="GoogleCalendarUriIntentFilter" android:label="@string/app_label"
             android:theme="@android:style/Theme.Light"
             android:configChanges="orientation|keyboardHidden">