Crash fix in the tutorial

astrid/res/layout/welcome_walkthrough_simple_login.xml

@@ -17,9 +17,11 @@
     <Button
         android:id="@+id/quick_login_google"
         android:layout_width="280dip"
-        android:layout_height="45dip" 
+        android:layout_height="wrap_content" 
+        android:minHeight="45dip" 
         android:textSize="16sp"
         android:background="@drawable/google_login_background"
+        android:textColor="@android:color/white"
         android:layout_marginBottom="15dip"/>
     
     <TextView

astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java

@@ -79,8 +79,10 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
             title[title.length - 1] = R.string.welcome_title_7_return;
             images[images.length - 1] = R.drawable.welcome_walkthrough_1;
             body[body.length - 1] = R.string.welcome_body_7_return;
+            fallbackLoginPage = R.layout.welcome_walkthrough_page;
         } else {
             // Setup login page from AB tests
+            fallbackLoginPage = layouts[layouts.length - 1];
             if (ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_YES_GOOGLE) != ABChooser.NO_OPTION) {
                 int choice = ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_YES_GOOGLE);
                 switch (choice) {