Merge "Make EmailActivity the default activity."

This commit is contained in:
Makoto Onuki 2011-06-21 14:37:01 -07:00 committed by Android (Google) Code Review
commit 6500ba21a0
1 changed files with 5 additions and 5 deletions

View File

@ -93,11 +93,6 @@
<activity <activity
android:name=".activity.Welcome" android:name=".activity.Welcome"
> >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW" /> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -197,6 +192,11 @@
</activity> </activity>
<activity <activity
android:name=".activity.EmailActivity"> android:name=".activity.EmailActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity> </activity>
<activity <activity
android:name=".activity.MessageFileView" android:name=".activity.MessageFileView"