auto import from //branches/cupcake/...@131421
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4b83ea8..c6d2e36 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -91,8 +91,22 @@
android:label="@string/accounts_title"
android:launchMode="singleTop" >
</activity>
+
+ <activity
+ android:name=".activity.AccountShortcutPicker"
+ android:label="@string/app_name">
+ <intent-filter>
+ <action android:name="android.intent.action.CREATE_SHORTCUT" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
+
<activity
android:name=".activity.FolderMessageList">
+ <intent-filter>
+ <!-- This action is only to allow an entry point for launcher shortcuts -->
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
</activity>
<activity
android:name=".activity.MessageView"
@@ -112,12 +126,9 @@
</intent-filter>
<intent-filter android:label="@string/app_name">
<action android:name="android.intent.action.SEND" />
- <data android:mimeType="image/*" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <intent-filter android:label="@string/app_name">
- <action android:name="android.intent.action.SEND" />
<data android:mimeType="text/plain" />
+ <data android:mimeType="image/*" />
+ <data android:mimeType="video/*" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
