Disable building IM from the source code since we checked in the prebuilt version

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index eb26284..c0b26aa 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,7 +19,8 @@
  */
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.im" android:sharedUserId="android.uid.im">
+    package="com.android.im" android:sharedUserId="android.uid.im"
+    android:sharedUserLabel="@string/perm_label">
 
     <uses-permission android:name="com.android.providers.im.permission.READ_ONLY" />
     <uses-permission android:name="com.android.providers.im.permission.WRITE_ONLY" />
@@ -64,16 +65,32 @@
             </intent-filter>
         </service>
 
+        <activity android:name=".app.ChooseAccountActivity"
+                android:theme="@android:style/Theme.NoDisplay">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".app.ImUrlActivity" >
             <intent-filter>
                 <action android:name="android.intent.action.SENDTO" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <!-- this needs to match the entries in android.provider.Im.ProviderCategories -->
                 <category android:name="com.android.im.category.AIM" />
                 <category android:name="com.android.im.category.MSN" />
                 <category android:name="com.android.im.category.YAHOO" />
                 <data android:scheme="im" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.SENDTO" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="imto" android:host="aim"/>
+                <data android:scheme="imto" android:host="yahoo"/>
+                <data android:scheme="imto" android:host="msn"/>
+            </intent-filter>
         </activity>
 
         <activity android:name=".app.AccountActivity">
@@ -118,7 +135,8 @@
             android:label="@string/add_contact_title"/>
 
         <activity android:name=".app.NewChatActivity"
-                android:configChanges="orientation|keyboardHidden">
+                android:configChanges="orientation|keyboardHidden"
+                android:windowSoftInputMode="stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />