Merge pull request #81 from sbosley/110906_sb_throttle_welcome_screen

Skip login screen, go to welcome graphic first

astrid/AndroidManifest.xml

@@ -75,14 +75,14 @@
     <!-- Activity that displays task list -->
     <activity android:name="com.todoroo.astrid.welcome.WelcomeLogin"
               android:windowSoftInputMode="stateHidden">
+    </activity>
+    <activity android:name="com.todoroo.astrid.welcome.WelcomeScreen"
+              android:windowSoftInputMode="stateHidden">    
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>              
     </activity>
-    <activity android:name="com.todoroo.astrid.welcome.WelcomeScreen"
-              android:windowSoftInputMode="stateHidden">    
-    </activity>
     <activity android:name="com.todoroo.astrid.activity.TaskListActivity"
               android:windowSoftInputMode="stateHidden">
       <intent-filter>

astrid/src/com/todoroo/astrid/welcome/WelcomeScreen.java

@@ -12,6 +12,7 @@ import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
+import com.todoroo.astrid.activity.Eula;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.service.StartupService;
 
@@ -28,6 +29,8 @@ public class WelcomeScreen extends Activity {
         new StartupService().onStartupApplication(this);
         setContentView(R.layout.welcome_screen);
 
+        Eula.showEula(this);
+
         final ImageView image = (ImageView)findViewById(R.id.welcome_image);
         image.setOnClickListener(new OnClickListener() {
             @Override