Automated import from //branches/cupcake/...@142643,142643

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fe89685..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" />
@@ -135,7 +136,7 @@
 
         <activity android:name=".app.NewChatActivity"
                 android:configChanges="orientation|keyboardHidden"
-                android:windowSoftInputMode="stateHidden">
+                android:windowSoftInputMode="stateUnchanged">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />