commit 04ff99c8ac7742e952afb8a25b17f7997fc907de
author Vikram Aggarwal <viki@google.com> Tue Feb 28 15:29:13 2012 -0800
committer Vikram Aggarwal <viki@google.com> Wed Feb 29 11:14:40 2012 -0800
tree 26dc4c85e57777d64efcd374ba7262a150397f31
parent 161f50d0fabdaa384a63ce69f595861c5e69795f

Remove test activity entirely

Change-Id: Iff2027620f8d109aec581f82528430f04ad58e9b

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 86115a1..c3bab37 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -33,13 +33,21 @@
         android:icon="@mipmap/ic_launcher_mail"
         android:label="@string/app_name"
         android:theme="@android:style/Theme.Holo.Light" >
+        <!-- TODO: add a permission on this -->
         <activity
             android:label="@string/app_name"
-            android:name=".UnifiedEmail" >
+            android:name=".ui.MailActivity"
+            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" />
+                <data android:scheme="content"/>
+                <data android:mimeType="application/mail-ls" />
+            </intent-filter>
         </activity>
         <activity android:name=".compose.ComposeActivity">
             <intent-filter>
@@ -68,17 +76,6 @@
                 <data android:mimeType="*/*" />
             </intent-filter>
         </activity>
-        <!-- TODO: add a permission on this -->
-        <activity
-           android:name=".ui.MailActivity"
-           android:uiOptions="splitActionBarWhenNarrow">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <data android:scheme="content"/>
-                <data android:mimeType="application/mail-ls" />
-            </intent-filter>
-        </activity>
         <activity android:name="LabelSynchronizationActivity"
             android:theme="@android:style/Theme.Holo.Light.Dialog" />