commit 08305245895c9288e6a2083d4f42802ed7cc67b9
author Makoto Onuki <omakoto@google.com> Wed Aug 04 15:38:25 2010 -0700
committer Makoto Onuki <omakoto@google.com> Thu Aug 05 13:58:20 2010 -0700
tree 8ea93527d1db24b1d5b2f1c56b01154d4b9c8a8a
parent cfc4144b17c3870780ebfe8269f8106aaaaec533

Make Welcome launch MessageListXL

Also added the "1 pane" activity to test the phone UI.

Change-Id: I1c86d2088a2298ada5028b7a266bd090b593593c

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 060857b..fbd61f4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -59,24 +59,12 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name"
         android:name="Email">
         <activity
-            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>
-        </activity>
-        <!--
-            We show this on the home for the development purpose.
-            STOPSHIP: Remove label, and MAIN/LAUNCHER intent filter.
-        -->
-        <activity
-            android:name=".activity.MessageListXL"
-            android:label="@string/activity_label_2pane"
-            android:theme="@android:style/Theme.WithActionBar"
+            android:name=".activity.Welcome"
+            android:theme="@android:style/Theme.WithActionBar" >
             >
             <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>
@@ -180,10 +168,11 @@
         <activity
             android:name=".activity.MessageList"
             android:theme="@style/ThemeNoTitleBar">
-            <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.MessageListXL"
+            android:theme="@android:style/Theme.WithActionBar"
+            >
         </activity>
 
         <!--
@@ -420,5 +409,29 @@
         </provider>
         <!--EXCHANGE-REMOVE-SECTION-END-->
 
+        <!--
+            STOPSHIP: These aliases are only for development.  Remove them.
+        -->
+        <activity-alias
+            android:name="dev_one_pane"
+            android:label="@string/activity_label_1pane"
+            android:targetActivity=".activity.AccountFolderList"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+        <activity-alias
+            android:name="dev_two_pane"
+            android:label="@string/activity_label_2pane"
+            android:targetActivity=".activity.MessageListXL"
+            >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
     </application>
 </manifest>

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 076898b..df3948f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -717,5 +717,7 @@
 
     <!-- Do Not Translate.  STOPSHIP: Dev version only.  Remove this. -->
     <string name="activity_label_2pane">Email 2 Pane</string>
+    <!-- Do Not Translate.  STOPSHIP: Dev version only.  Remove this. -->
+    <string name="activity_label_1pane">Email 1 Pane</string>
 
 </resources>