summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Westbrook <pwestbro@google.com>2012-07-21 05:35:21 -0700
committerPaul Westbrook <pwestbro@google.com>2012-07-21 05:35:21 -0700
commit70744d63330dc4b5c51cf1b192173e72d6910779 (patch)
tree27d96d62596f77092114542bca50fb7bad42ab3f
parentf3702a979641c2bbe35422675cdb8d29864e4468 (diff)
downloadandroid_packages_apps_Email-70744d63330dc4b5c51cf1b192173e72d6910779.tar.gz
android_packages_apps_Email-70744d63330dc4b5c51cf1b192173e72d6910779.tar.bz2
android_packages_apps_Email-70744d63330dc4b5c51cf1b192173e72d6910779.zip
Fix app shorcut after upgrade
Now old app shortcuts will continue to work after upgrading to 4.2 Also re-add the APP_EMAIL category Bug: 6363841 Change-Id: Ib3bc860931da4c25e06f084e9fffe96703fd4f0f
-rw-r--r--AndroidManifest.xml15
1 files changed, 11 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index abc57d7c9..d6932e130 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -181,10 +181,6 @@
android:label="@string/app_name"
android:name="com.android.email2.ui.MailActivityEmail"
android:uiOptions="splitActionBarWhenNarrow">
- <intent-filter >
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
@@ -198,6 +194,17 @@
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
</activity>
+ <activity-alias android:name="com.android.email.activity.Welcome"
+ android:targetActivity="com.android.email2.ui.MailActivityEmail"
+ android:label="@string/app_name" >
+ <intent-filter >
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ <category android:name="android.intent.category.APP_EMAIL" />
+ </intent-filter>
+ </activity-alias>
+
<activity
android:name=".provider.FolderPickerActivity"
android:label="@string/folder_picker_title"