From 56cd3d4beb24dc92356b13a4503631833dd618a8 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 4 Dec 2012 15:18:19 -0800
Subject: [PATCH 1/8] Mostly working simple login page in the welcome
 walkthrough

---
 .../astrid/actfm/ActFmGoogleAuthActivity.java |  2 +-
 .../welcome_walkthrough_simple_login.xml      | 29 ++++++
 astrid/res/values/strings-actfm.xml           | 12 +--
 .../welcome/tutorial/WelcomePagerAdapter.java | 15 ++-
 .../welcome/tutorial/WelcomeWalkthrough.java  | 98 +++++++++++++++++++
 5 files changed, 142 insertions(+), 14 deletions(-)
 create mode 100644 astrid/res/layout/welcome_walkthrough_simple_login.xml

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
index 068d099eb..26a07fefe 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
@@ -41,7 +41,7 @@ import com.todoroo.astrid.service.StatisticsService;
  */
 public class ActFmGoogleAuthActivity extends ListActivity {
 
-    private static final String AUTH_TOKEN_TYPE = "oauth2:https://www.googleapis.com/auth/userinfo.profile"; //$NON-NLS-1$
+    public static final String AUTH_TOKEN_TYPE = "oauth2:https://www.googleapis.com/auth/userinfo.profile"; //$NON-NLS-1$
 
     public static final String RESULT_EMAIL = "email"; //$NON-NLS-1$
     public static final String RESULT_TOKEN = "token"; //$NON-NLS-1$
diff --git a/astrid/res/layout/welcome_walkthrough_simple_login.xml b/astrid/res/layout/welcome_walkthrough_simple_login.xml
new file mode 100644
index 000000000..be446732b
--- /dev/null
+++ b/astrid/res/layout/welcome_walkthrough_simple_login.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" 
+    android:background="@drawable/astrid_com_gradient"
+    android:gravity="center_horizontal">
+    
+    <ImageView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_weight="1"
+        android:src="@drawable/astrid_com_logo" />
+    
+    <Button
+        android:id="@+id/quick_login_google"
+        android:layout_width="250dip"
+        android:layout_height="60dip" 
+        android:layout_marginTop="30dip"
+        android:layout_marginBottom="15dip"/>
+    
+    <TextView
+        android:id="@+id/quick_login_reject"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="60dip"
+        android:text="Not this person"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/values/strings-actfm.xml b/astrid/res/values/strings-actfm.xml
index f9d547735..ed75a2ce3 100644
--- a/astrid/res/values/strings-actfm.xml
+++ b/astrid/res/values/strings-actfm.xml
@@ -234,15 +234,11 @@
   <!-- share login: Sharing Login GG Prompt -->
   <string name="actfm_ALA_gg_login">Connect with Google</string>
   
-  <!-- share login: Sharing Footer Password Label -->
+  <!-- share login: Quickly log in as <%s -> email> -->
+  <string name="actfm_quick_login">Sign in: %s</string>
 
-  <!-- share login: Sharing Password Link -->
-
-  <!-- share login: Password Are you a New User? -->
-
-  <!-- share login: Password Are you a Returning User? -->
-
-  <!-- share login: Name -->
+  <!-- share login: Reject quick login -->
+  <string name="actfm_quick_login_reject">Not %s?</string>
 
   <!-- share login: Name -->
   <string name="actfm_ALA_firstname_label">First Name</string>
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index cf034c128..ac624def8 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -25,7 +25,7 @@ import com.viewpagerindicator.TitleProvider;
 
 public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
 {
-    private static int[] images = new int[] {
+    private final int[] images = new int[] {
         R.drawable.welcome_walkthrough_1,
         R.drawable.welcome_walkthrough_2,
         R.drawable.welcome_walkthrough_3,
@@ -34,7 +34,7 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
         R.drawable.welcome_walkthrough_6,
         0
     };
-    private static int[] title = new int[] {
+    private final int[] title = new int[] {
         R.string.welcome_title_1,
         R.string.welcome_title_2,
         R.string.welcome_title_3,
@@ -43,7 +43,7 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
         R.string.welcome_title_6,
         R.string.welcome_title_7,
     };
-    private static int[] body = new int[] {
+    private final int[] body = new int[] {
         R.string.welcome_body_1,
         R.string.welcome_body_2,
         R.string.welcome_body_3,
@@ -52,14 +52,14 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
         R.string.welcome_body_6,
         R.string.welcome_body_7,
     };
-    private static int[] layouts = new int[] {
+    public final int[] layouts = new int[] {
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_login_page,
+        R.layout.welcome_walkthrough_simple_login,
     };
 
     private final Context context;
@@ -91,6 +91,11 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
         return layouts.length;
     }
 
+    public void changeLoginPage(int newLayout) {
+        layouts[layouts.length - 1] = newLayout;
+        notifyDataSetChanged();
+    }
+
     @Override
     public Object instantiateItem(final View pager, final int position) {
         LayoutInflater inflater = LayoutInflater.from(context);
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index ce8a900e2..291a1d58c 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -6,6 +6,14 @@
 
 package com.todoroo.astrid.welcome.tutorial;
 
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AccountManagerCallback;
+import android.accounts.AccountManagerFuture;
+import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.graphics.Color;
 import android.os.Bundle;
@@ -13,16 +21,22 @@ import android.support.v4.view.ViewPager;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextPaint;
+import android.text.TextUtils;
 import android.text.style.ClickableSpan;
+import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
+import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.DialogUtilities;
+import com.todoroo.astrid.actfm.ActFmGoogleAuthActivity;
 import com.todoroo.astrid.actfm.ActFmLoginActivity;
+import com.todoroo.astrid.gtasks.auth.ModernAuthManager;
 import com.viewpagerindicator.CirclePageIndicator;
 import com.viewpagerindicator.PageIndicator;
 
@@ -68,6 +82,90 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         }
     }
 
+    @Override
+    protected void initializeUI() {
+        String[] accounts = ModernAuthManager.getAccounts(this);
+        String email = null;
+        if (accounts != null && accounts.length > 0) {
+            email = accounts[0];
+        }
+        Button simpleLogin = (Button) findViewById(R.id.quick_login_google);
+        if (simpleLogin != null && !TextUtils.isEmpty(email)) {
+            initializeSimpleUI(email);
+        } else {
+            if (mAdapter != null && mAdapter.layouts[mAdapter.layouts.length - 1] != R.layout.welcome_walkthrough_login_page)
+                mAdapter.changeLoginPage(R.layout.welcome_walkthrough_login_page);
+            super.initializeUI();
+        }
+    }
+
+    private void initializeSimpleUI(final String email) {
+        Button simpleLogin = (Button) findViewById(R.id.quick_login_google);
+        simpleLogin.setText(getString(R.string.actfm_quick_login, email));
+        simpleLogin.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                final ProgressDialog pd = DialogUtilities.progressDialog(WelcomeWalkthrough.this, getString(R.string.gtasks_GLA_authenticating));
+                pd.show();
+                GoogleAccountManager accountManager = new GoogleAccountManager(WelcomeWalkthrough.this);
+                Account a = accountManager.getAccountByName(email);
+                AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+                    public void run(final AccountManagerFuture<Bundle> future) {
+                        new Thread() {
+                            @Override
+                            public void run() {
+                                try {
+                                    Bundle bundle = future.getResult(30, TimeUnit.SECONDS);
+                                    if (bundle.containsKey(AccountManager.KEY_AUTHTOKEN)) {
+                                        String authToken = bundle.getString(AccountManager.KEY_AUTHTOKEN);
+                                        onAuthTokenSuccess(email, authToken);
+                                    }
+                                } catch (final Exception e) {
+                                    Log.e("actfm-google-auth", "Login Error", e); //$NON-NLS-1$ //$NON-NLS-2$
+                                    runOnUiThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            int error = e instanceof IOException ? R.string.gtasks_GLA_errorIOAuth :
+                                                R.string.gtasks_GLA_errorAuth;
+                                            Toast.makeText(WelcomeWalkthrough.this,
+                                                    error,
+                                                    Toast.LENGTH_LONG).show();
+                                        }
+                                    });
+                                } finally {
+                                    DialogUtilities.dismissDialog(WelcomeWalkthrough.this, pd);
+                                }
+                            }
+                        }.start();
+                    }
+                };
+                accountManager.manager.getAuthToken(a, ActFmGoogleAuthActivity.AUTH_TOKEN_TYPE, null, WelcomeWalkthrough.this, callback, null);
+            }
+        });
+
+        TextView rejectQuickLogin = (TextView) findViewById(R.id.quick_login_reject);
+        rejectQuickLogin.setText(getString(R.string.actfm_quick_login_reject, email));
+        rejectQuickLogin.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mAdapter.changeLoginPage(R.layout.welcome_walkthrough_login_page);
+                mPager.setAdapter(mAdapter);
+                mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
+                initializeUI();
+            }
+        });
+    }
+
+    private void onAuthTokenSuccess(final String email, final String authToken) {
+        runOnUiThread(new Runnable() {
+
+            @Override
+            public void run() {
+                authenticate(email, email, "", "google", authToken); //$NON-NLS-1$ //$NON-NLS-2$
+            }
+        });
+    }
+
     public void onPageChanged(View view, int position) {
         currentPage = position;
         currentView = view;

From e728bde5d658df12ac0406edb6837761ad1e6f34 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 4 Dec 2012 16:03:09 -0800
Subject: [PATCH 2/8] Polished the simple login screen to look like the mockup

---
 .../res/drawable-hdpi/astrid_com_logo_new.png  | Bin 0 -> 25152 bytes
 .../drawable-hdpi/fb_login_background.9.png    | Bin 0 -> 1345 bytes
 .../google_login_background.9.png              | Bin 0 -> 1960 bytes
 astrid/res/drawable/astrid_com_gradient.xml    |   4 ++--
 .../welcome_walkthrough_simple_login.xml       |  17 +++++++++++------
 5 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 astrid/res/drawable-hdpi/astrid_com_logo_new.png
 create mode 100644 astrid/res/drawable-hdpi/fb_login_background.9.png
 create mode 100644 astrid/res/drawable-hdpi/google_login_background.9.png

diff --git a/astrid/res/drawable-hdpi/astrid_com_logo_new.png b/astrid/res/drawable-hdpi/astrid_com_logo_new.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f29cb6e28913a4cd92b24d10f34b08c9c0b4612
GIT binary patch
literal 25152
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/fb_login_background.9.png b/astrid/res/drawable-hdpi/fb_login_background.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..49b7d483b85d4b7d35e37161ea44dfde2956ddcd
GIT binary patch
literal 1345
zcmV-H1-|-;P)<h;3K|Lk000e1NJLTq006H5002t}1^@s621nQ7000FDNkl<Zc-rmU
ze@xVM9LMqRAGLCIcl@{@R8ni%=IW1Pb8GVtwi<WeqX<mGfct(8;Rr=3WDLg$V@R$t
zwPISC6)9P6&D#7CTPlm$4@qayX3_eAHCAM{oLfKl>HE36?{!nS-SNZk_vHEBUSoXk
zc01lY`0V}pd~YZUHQh^0i=XmZwQPaYqb+o)dVrA0jMG!@b>-<fimF~UiD0!QE>(Nm
z>C;ABK3xzp<x#aGF0a-!ZnW3<%5HP|^aIf^n!aR(a6hnGWK}eiQDXLqUL>B3vU<bT
zDv^@^P&DKd#-dr55L~CvUuwQU>U~urdu4~XdEE|i%le%pMp6rw2YW^@CXn{m#oUI?
z!d<dDg4h7ul`vfS7csx>H5wXcQtk!sWM)qNMx&<{A;7BkPE5ECueQj9o4slS4Fs>{
zxv6=ZNGlAOtMK-*S6x**DxWkn&`RULYn$A-wlgvdJ3Zz37r}L@{$}~0ySO$uchEHO
z+9|VZ+Qaj&eqgj!_XGLh+=eYQ3%s_A+<T=KR)xj~c^({n^FdxrE2^eZ;I(bCDqF&v
zH@!V-WY7cV=>kmxuU#{*@wxEEP3!%CWbo?G2TvGkpP)(LwQc0RhVZ%XNYvS`)-5m2
zdE{xD1YTRmJj#uHpa{I+1uuBP3tsRN@PZe-1iauKS8m<VEo$C6B6c1-B~JeMix?O_
zBhLT%w~!^j%I{?k5B?z5_w<7oy!ME9+q>e+pU#SS>&@eX;03SsxpUJVar*2zkw`uH
z{&Dbv*ZRmYAknIP;}CekYi$<4ykCr`?&{nNUhrC*t$m*-4EL{p{uK*4c7YeX)~5T@
zuVO;&IW;6oUOgC`i{&aUPb1ds?c=Bny!OU>=KLSx_NR7p&I{h;!z+)@xJd!tq{J(4
zRDc(}Nr|_A=x6YP7rfvF?}SsheV=H1?^y8muFT-bZ)4*9{@33{%l?lp3a1U=wImx4
zoe&c(t2c7s1@E})!*7Sd3*O|!yYGwdzzg2w#4A7V3tsRhCEjOyPl9*4;=SJAD6$`J
zvm|#kJ|lb`F9lPwsY@Il_<BsF1E+^0&y9|J4XfV2Ov*i>|72+8d$`<VOS~7R^I+eY
zct05&vSnkz3tsRN@PZe--~}&u!ArmkUhsk!yx^UJZ0$J;UXq-6yL$V<OTY_W@PZe-
z-~}%MFL=QVUhsk!yx;{dcnNsH3tsSo7rfvlmp|TQ40yo{UIJe5f|r2Tws-}2!JEV@
zuf9cI$Shk!gTQOs%nq~$`)e$=BZ^rruht|lW-P6vN#M0@W>z$tD{p@UufwY?k{8p8
zs%a8<ZJUhJ`q0X&YMUc?mE7Db%voYqWebf0uPu{S7zp9@l;<naWz4;=$OqiTD`^yX
zZI>*)$((mTRxYd=cWXD8t8dn_wKNR8HrlAI6R8E2p?TNXpDCl2OVwYHPmsTaS<4w8
zz-xn4KQ7W2*Mw(Xy+?^v#xT6g1k4HyUQ1Wps@C8kLTDn;zL}A?G&?3<B`4=f1MqHh
zgm4$vvWWxlC0}hb%jzTjG$w-296oKn5^p(G|6?vyJ7*%6JH6{l>O^LF0~sSJ`OAX6
zq8H;!M(Lv>{r(lg74BmQuC~XK`=DD%w64zc&og#+U2@5eyci*uAacHSc(o#BGRo=E
z78*-;z44duA|X=|18lp)s~0#u#c2v<s}dxx#9jXZNv^*KS$V>U00000NkvXXu0mjf
D7(1Z#

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable-hdpi/google_login_background.9.png b/astrid/res/drawable-hdpi/google_login_background.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..56511c7b7ab535e318179c195869797fb70f25d9
GIT binary patch
literal 1960
zcmV;Z2UqxsP)<h;3K|Lk000e1NJLTq006!K002t}1^@s6&MQ4P000MXNkl<Zc-rlq
zdr(w$6vy|EnsSO=K*CVTN0T*9P7lkOCTo}}Wp_zKlQbT86?vqhBobi^VF*e-!Uq@{
z%82q1pQMOls0=7+Am*coRHis-B4H3d5dF1hm%Hxcg3D@n@AZ3TzBA6<`}+-Z?&qF8
z=iIYbg#z}V7=sHOw8u38gO%RgFqK9Z20>zx(mPPC8mSwq&}bgHhp=<wR2puJQp?q=
zv^oYsqLzl+uTpcd4g>#~HeiTSt1C9&wCA{~%<cUd%p*7s5)khv_@aB|9uTGHayoPN
znPh$w)aZkCWS5{<YJ>dw4P4$0WuDXKv1jJ2Vb3P7hdPnV=*b43!58;QN$Xhu=q1c;
z{0!3#poc%Z%h1!^G$?T`9BQYWM*)1Xs9)4#{q+bo!mr^9JB8j!%?;<F_ne*r2LgOa
z>*=@*=IR^9NB_)@qrHYZNGJ6UOMv45zAQ9wcDgC|S9%Bf*g&t+1jW&ZZhjGlTnSDC
z_;OL-DM{`5zOGm(+LzOZ{iBz{SpZ*FqB_;ZH`JK&P`}^&!4w^I9TN^m0eo4?BP71P
z(A6cGr8&AVzKa7V0em@XK+N*?B9|+>o#v=@X@*Wt#C$jj;LB3<9ICyqUvJjC=W^*_
zzmFEdNdRBA;#>8mfjxi^@Buy?1n>bq1n>bq1n>cVcWT6nLKeUCyDlrH@Bn*0B^TgB
z(gJ@{ZYirgeV#dD`)bdzx6-#E;zQB_-#4>}{qk3%3F6xN%PevC_bjda7^^u~F9>>F
zW3wsJhve-=ssl+2d`eHQ-e@zx+;;00OZm2%4W5@{aZcd65_abACL8#_syL1uACeyU
zQwsJQVCQX4@u3dSeJypPApGGQ_5plII^e&#Yzu3;)@lNnptg?m*7DEZZ3F&=rj~9k
zXaPRJzbmah{F4R1i}%*pwN9w`ow>Cf;6vgEpCbF^E7vXHwYNZ}qSx9=Pt^f@Nc`aY
ztlVw`FBP!%to6$(wpmMQ62ON<4?gwlt!>t}3cJ?6v@l<=wF&Sc(SuKEjkV=gpR#*>
zYuinWwbbhe_>kzqrw3NnR{!r6_QDr=cCF|8{=6+K`vKrX(kO0QuHUeM-=5CSD~mQ*
ztf8CW^(C7DJ|vBH=7uA+HsDiVp9<g3)<tY8vsjZ{QiTUtkaWPOC{5{&P|8EonH_yo
znD_B9vH(ePWPzf4L(4TA_$dua-G9^~=cj+0e@oo2ydK~K{ChUKP;~N-4#$mYYV*YT
z28;2AxE+=FAqpgqd3<%oH-<6fs<Rhu+Lh*(S$Pt_z=Guc(?g-ToI4f203W&|_)iAK
zFwYMYMXO8AEjHjUDBLTWzt8y{<6C*f?866Hk_G>8?O7Y}+iu=sp&11LACfQlpRC^@
znCBDx@%hC7ACf2d10#~z>5B~=7P{%XDgZtteeg%6WE!IU>e53jr@WdKRsYB?{?pv)
z+ZE^>x<LRwBq{L6r)C@AZMt$z5bR@T{xqnw$e&kn1mHu`0AHQ7ik+ylY*$wOR>wYG
zx1DL{eJvQpsiQ;ry^!hB@&G<0Ztw~2tF5=EGb!3nU%kbywPP1$3AQ=U);F^LQ|AJF
zNSxpYEzhw4w)IAvA-C_!9&f~_38p@jHUWG{bl_7&wgxtFQ;9=+y&Ur;YqXl~?CvfP
zzz6ttrzzI<V)P=1_oJJ}+^7=-@FCHG|7mWK&4Z}B$;&C_v3R9m$w7b*i4XkwTW#O2
zK=3-c-;h}gE%x$Xx*p&|;sc+$Io7snPo=~A`7T&v+J|Zfbafz6f=|7Bp}8CC^f<EL
z*2Bk5`#8D>zz6u<qF*muvVoua@?C9dn%4`<c9!GGEhKL6sn;%K)X%51=T2Q7uY`0~
zTyy({v#C4EFr)@a<H>Dg);0s^9U0~8l*Z8LF%7Mes8xC3=hLQ<g>wy;S@4Q{OlLyU
zn$;OGH-nWPKh@>`>xzI+-n@rB7ny>2d`P;}nXksCvV?+Ntl;2L!xX0Z7&3h;&@qbi
z^i;OH+m!$x;6nf(;6nf(-~)X40^kFD2;c*JNL1i6rB=6;4)h9`1qT6qS*mYXg5lce
zgM7V$H<g-;rGxGhBH<)}FH7|fj^iVKl?i+&H8-3Nx{e8llK{Rf<?bJ4jQAREi3xm#
zm)Apl{?jKU9*zR|vXiTCm=S#MKp%y<>GS+7`oPU^8XN`iWhD<?ET7*WQdnD$x4EbI
zsP8dxHXH`<Wm446VJ@RXjQPF3mQ@IuN~2pzC(s4#GZ`rlz?ZnfKW9D1PHE5WbtQ_<
zOrQMc@bDw@1ANIw`p^VJv&NXkaKHB$Il;42@D)RcKCFj7pHF+-{31~B0(?nD`Cb80
zrfZ?kVvad!xj_nhO{od`Or_zP`5S<$;wQ#OvR;AFPzQ4MnP~78e9`@K_n*mnzBiSr
z+OL5TdTyhW*9UHjuG*s`g9hj;;cWV<Fl`1wA{XWJPHJw9;$E22n;WM8%81h6MXMl4
uY|_J?<fPV(R(kunDqx~A2K}$<lKltj74|pNUpEB+0000<MNUMnLSTZ~>f5pa

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/astrid_com_gradient.xml b/astrid/res/drawable/astrid_com_gradient.xml
index 850b5c4e3..1ec360c5c 100644
--- a/astrid/res/drawable/astrid_com_gradient.xml
+++ b/astrid/res/drawable/astrid_com_gradient.xml
@@ -8,8 +8,8 @@
     android:shape="rectangle">
   <gradient
       android:type="radial"
-      android:startColor="#88d0f4"
-      android:endColor="#60abd6"
+      android:startColor="#70cef1"
+      android:endColor="#2d8db6"
       android:gradientRadius="300"
       android:centerX="0.5"
       android:centerY="0.5" />
diff --git a/astrid/res/layout/welcome_walkthrough_simple_login.xml b/astrid/res/layout/welcome_walkthrough_simple_login.xml
index be446732b..a412bac05 100644
--- a/astrid/res/layout/welcome_walkthrough_simple_login.xml
+++ b/astrid/res/layout/welcome_walkthrough_simple_login.xml
@@ -10,20 +10,25 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="1"
-        android:src="@drawable/astrid_com_logo" />
+        android:src="@drawable/astrid_com_logo_new"
+        android:padding="10dip"
+        android:scaleType="center" />
     
     <Button
         android:id="@+id/quick_login_google"
-        android:layout_width="250dip"
-        android:layout_height="60dip" 
-        android:layout_marginTop="30dip"
+        android:layout_width="280dip"
+        android:layout_height="45dip" 
+        android:layout_marginTop="-30dip"
+        android:textSize="16sp"
+        android:background="@drawable/google_login_background"
         android:layout_marginBottom="15dip"/>
     
     <TextView
         android:id="@+id/quick_login_reject"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="60dip"
-        android:text="Not this person"/>
+        android:layout_marginBottom="70dip"
+        android:textSize="16sp"
+        android:textColor="@android:color/white"/>
 
 </LinearLayout>
\ No newline at end of file

From 6d228312db7dd8d4e314efa0ba01ad63b357a9cb Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 4 Dec 2012 16:45:28 -0800
Subject: [PATCH 3/8] Polished the new layout for the standard login activity

---
 .../astrid/actfm/ActFmLoginActivity.java      |  12 +-
 astrid/res/layout/actfm_login_activity.xml    | 128 +++++++++---------
 .../layout/welcome_walkthrough_login_page.xml |   1 +
 .../welcome_walkthrough_simple_login.xml      |   5 +-
 astrid/res/values/strings-intro.xml           |   6 +-
 .../welcome/tutorial/WelcomeWalkthrough.java  |  32 ++---
 6 files changed, 79 insertions(+), 105 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 504ef04ca..b632c4c0c 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -36,7 +36,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup.LayoutParams;
 import android.view.WindowManager;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
@@ -215,13 +214,6 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
         return link;
     }
 
-    private void setupSignIn(TextView signIn) {
-        signIn.setOnClickListener(signInListener);
-        SpannableString content = new SpannableString(getString(R.string.welcome_sign_in));
-        content.setSpan(new UnderlineSpan(), 0, content.length(), 0);
-        signIn.setText(content);
-    }
-
     @SuppressWarnings("nls")
     protected void initializeUI() {
         facebook = new Facebook(APP_ID);
@@ -239,11 +231,11 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
         if(AmazonMarketStrategy.isKindleFire())
             googleLogin.setVisibility(View.GONE);
         googleLogin.setOnClickListener(googleListener);
-        Button signUp = (Button) findViewById(R.id.pw_signup);
+        TextView signUp = (TextView) findViewById(R.id.pw_signup);
         signUp.setOnClickListener(signUpListener);
 
         TextView signIn = (TextView) findViewById(R.id.pw_login);
-        setupSignIn(signIn);
+        signIn.setOnClickListener(signInListener);
 
         setupTermsOfService((TextView) findViewById(R.id.tos));
     }
diff --git a/astrid/res/layout/actfm_login_activity.xml b/astrid/res/layout/actfm_login_activity.xml
index 73ec6bf55..f935d47ae 100644
--- a/astrid/res/layout/actfm_login_activity.xml
+++ b/astrid/res/layout/actfm_login_activity.xml
@@ -13,101 +13,97 @@
     android:background="@drawable/astrid_com_gradient"
     android:orientation="vertical">
 
-    <TextView
-      android:id="@+id/intro"
-      android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
-      android:gravity="center"
-      android:layout_alignParentLeft="true"
-      android:textSize="16sp"
-      android:paddingTop="20dip"
-      android:textColor="#ffffff"
-      android:text="@string/actfm_ALA_body" />
-
     <ImageView
       android:id="@+id/logo"
       android:layout_width="fill_parent"
-      android:layout_height="110dip"
-      android:scaleType="fitCenter"
-      android:paddingLeft="20dip"
-      android:paddingRight="20dip"
-      android:paddingBottom="10dip"
-      android:src="@drawable/astrid_com_logo" />
+      android:layout_height="fill_parent"
+      android:layout_weight="1"
+      android:paddingTop="95dip"
+      android:scaleType="center"
+      android:src="@drawable/astrid_com_logo_new" />
       
     <TextView
       android:id="@+id/error"
       android:layout_width="fill_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="45dip"
       android:gravity="center"
       android:textColor="#ff0000"
       android:textSize="16sp"
       android:textStyle="bold" />
     
-    <RelativeLayout
+    <LinearLayout
       android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:paddingTop="5dip">
-      
-        <TextView
-          android:id="@+id/tos"
-          android:layout_width="fill_parent"
-          android:layout_height="35dip"
-          android:layout_alignParentBottom="true"
-          android:gravity="center"
-          android:paddingLeft="20dip"
-          android:paddingRight="20dip"
-          android:textSize="12.5sp"
-          android:textColor="#ffffff" />  
-
-        <TextView
-            android:id="@+id/pw_login"
-            android:layout_width="wrap_content"
-            android:layout_height="35dip"
-            android:gravity="center"
-            android:layout_centerHorizontal="true"
-            android:layout_above="@id/tos" 
-            android:textColor="#444"
-            android:textSize="16sp"
-            android:text="@string/welcome_sign_in"/>
-            
-        <Button
-          android:id="@+id/pw_signup"
-          android:layout_width="fill_parent"
-          android:layout_height="45dip"
-          android:layout_above="@id/pw_login"
-          android:paddingLeft="17dip"
-          android:paddingRight="20dip"
-          android:layout_marginLeft="15dip"
-          android:layout_marginRight="15dip"
-          android:drawableLeft="@drawable/notif_astrid"
-          android:textSize="16sp" 
-          android:text="@string/welcome_login_pw"/>    
-      
+      android:layout_height="wrap_content"
+      android:orientation="vertical">
         <com.facebook.android.LoginButton
           android:id="@+id/fb_login"
           android:layout_width="fill_parent"
           android:layout_height="45dip"
-          android:layout_above="@id/pw_signup"
-          android:paddingLeft="20dip"
-          android:paddingRight="20dip"
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
+          android:layout_marginBottom="15dip"
           android:textSize="16sp"
-          android:drawableLeft="@drawable/facebook"
+          android:gravity="left|center_vertical"
+          android:background="@drawable/fb_login_background"
+          android:textColor="@android:color/white"
           android:text="@string/actfm_ALA_fb_login" />
                             
         <Button
           android:id="@+id/gg_login"
           android:layout_width="fill_parent"
           android:layout_height="45dip"
-          android:layout_above="@id/fb_login"
-          android:paddingLeft="20dip"
-          android:paddingRight="20dip"
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
           android:textSize="16sp"
-          android:drawableLeft="@drawable/google"
+          android:gravity="left|center_vertical"
+          android:background="@drawable/google_login_background"
+          android:textColor="@android:color/white"
           android:text="@string/actfm_ALA_gg_login" />
           
-  </RelativeLayout>
+        <TextView
+          android:id="@+id/tos"
+          android:layout_width="fill_parent"
+          android:layout_height="35dip"
+          android:gravity="center"
+          android:paddingLeft="20dip"
+          android:paddingRight="20dip"
+          android:textSize="12.5sp"
+          android:visibility="invisible"
+          android:textColor="#ffffff" />  
+    </LinearLayout>
+    
+    <LinearLayout 
+        android:layout_width="fill_parent"
+        android:layout_height="45dip"
+        android:orientation="horizontal">
+        <TextView
+          android:id="@+id/login_later"
+          android:text="@string/welcome_login_later"
+          android:layout_width="fill_parent"
+          android:layout_height="45dip"
+          android:gravity="center"
+          android:layout_weight="1"
+          android:textSize="16sp"
+          android:textColor="@android:color/white" 
+          android:visibility="gone"/>
+        <TextView
+          android:id="@+id/pw_login"
+          android:layout_width="fill_parent"
+          android:layout_height="45dip"
+          android:layout_weight="1"
+          android:gravity="center"
+          android:textColor="@android:color/white"
+          android:textSize="16sp"
+          android:text="@string/welcome_sign_in"/>
+        <TextView
+          android:id="@+id/pw_signup"
+          android:layout_width="fill_parent"
+          android:layout_height="45dip"
+          android:layout_weight="1"
+          android:gravity="center"
+          android:textColor="@android:color/white"
+          android:textSize="16sp" 
+          android:text="@string/welcome_login_pw"/>    
+        
+    </LinearLayout>
 </LinearLayout>
diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml
index 5b5e5660d..0c81978bf 100644
--- a/astrid/res/layout/welcome_walkthrough_login_page.xml
+++ b/astrid/res/layout/welcome_walkthrough_login_page.xml
@@ -112,6 +112,7 @@
 	      android:paddingRight="20dip"
 	      android:paddingBottom="5dip"
 	      android:textSize="16sp"
+	      android:text="@string/welcome_login_later"
 	      android:textColor="#444444" />
 	      
   </RelativeLayout>
diff --git a/astrid/res/layout/welcome_walkthrough_simple_login.xml b/astrid/res/layout/welcome_walkthrough_simple_login.xml
index a412bac05..cd5619507 100644
--- a/astrid/res/layout/welcome_walkthrough_simple_login.xml
+++ b/astrid/res/layout/welcome_walkthrough_simple_login.xml
@@ -10,15 +10,14 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="1"
+        android:paddingTop="39dip"
         android:src="@drawable/astrid_com_logo_new"
-        android:padding="10dip"
         android:scaleType="center" />
     
     <Button
         android:id="@+id/quick_login_google"
         android:layout_width="280dip"
         android:layout_height="45dip" 
-        android:layout_marginTop="-30dip"
         android:textSize="16sp"
         android:background="@drawable/google_login_background"
         android:layout_marginBottom="15dip"/>
@@ -26,7 +25,7 @@
     <TextView
         android:id="@+id/quick_login_reject"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="45dip"
         android:layout_marginBottom="70dip"
         android:textSize="16sp"
         android:textColor="@android:color/white"/>
diff --git a/astrid/res/values/strings-intro.xml b/astrid/res/values/strings-intro.xml
index b5ba0e7a3..0f7b0a361 100644
--- a/astrid/res/values/strings-intro.xml
+++ b/astrid/res/values/strings-intro.xml
@@ -38,12 +38,12 @@
   <string name="welcome_login_tos_link">Terms of Service</string>
   
   <!-- slide 7e -->
-  <string name="welcome_login_pw">Sign up with email</string>
+  <string name="welcome_login_pw">Sign up</string>
   
-  <string name="welcome_sign_in">Sign in</string>
+  <string name="welcome_sign_in">Log in</string>
 
   <!-- slide 7f -->
-  <string name="welcome_login_later">Connect Later</string>
+  <string name="welcome_login_later">Later</string>
   
   <string name="welcome_login_confirm_later_title">Why not sign in?</string>
   
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index 291a1d58c..373662171 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -15,14 +15,9 @@ import android.accounts.AccountManagerCallback;
 import android.accounts.AccountManagerFuture;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextPaint;
 import android.text.TextUtils;
-import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -82,6 +77,10 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         }
     }
 
+    private int getLoginPageLayout() {
+        return R.layout.actfm_login_activity;
+    }
+
     @Override
     protected void initializeUI() {
         String[] accounts = ModernAuthManager.getAccounts(this);
@@ -93,8 +92,8 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         if (simpleLogin != null && !TextUtils.isEmpty(email)) {
             initializeSimpleUI(email);
         } else {
-            if (mAdapter != null && mAdapter.layouts[mAdapter.layouts.length - 1] != R.layout.welcome_walkthrough_login_page)
-                mAdapter.changeLoginPage(R.layout.welcome_walkthrough_login_page);
+            if (mAdapter != null && mAdapter.layouts[mAdapter.layouts.length - 1] != getLoginPageLayout())
+                mAdapter.changeLoginPage(getLoginPageLayout());
             super.initializeUI();
         }
     }
@@ -148,7 +147,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         rejectQuickLogin.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mAdapter.changeLoginPage(R.layout.welcome_walkthrough_login_page);
+                mAdapter.changeLoginPage(getLoginPageLayout());
                 mPager.setAdapter(mAdapter);
                 mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
                 initializeUI();
@@ -186,6 +185,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                 currentView.findViewById(R.id.welcome_walkthrough_image).setOnClickListener(done);
             }
         }
+        ((CirclePageIndicator) mIndicator).setVisibility(currentPage == mAdapter.getCount()-1 ? View.GONE : View.VISIBLE);
     }
 
     protected void setupPWLogin() {
@@ -196,21 +196,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
     protected void setupLoginLater() {
         TextView loginLater = (TextView)currentView.findViewById(R.id.login_later);
         loginLater.setOnClickListener(loginLaterListener);
-        String loginLaterBase = getString(R.string.welcome_login_later);
-        SpannableString loginLaterLink = new SpannableString(String.format("%s", loginLaterBase)); //$NON-NLS-1$
-        ClickableSpan laterSpan = new ClickableSpan() {
-            @Override
-            public void onClick(View widget) {
-                loginLaterListener.onClick(widget);
-            }
-            @Override
-            public void updateDrawState(TextPaint ds) {
-                ds.setUnderlineText(true);
-                ds.setColor(Color.rgb(68, 68, 68));
-            }
-        };
-        loginLaterLink.setSpan(laterSpan, 0, loginLaterBase.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        loginLater.setText(loginLaterLink);
+        loginLater.setVisibility(View.VISIBLE);
     }
 
 

From b5cba0528854ddd357d2bcb31878032962d06729 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 4 Dec 2012 16:53:42 -0800
Subject: [PATCH 4/8] Handle google auth errors on simple login page better

---
 .../welcome/tutorial/WelcomePagerAdapter.java |  2 ++
 .../welcome/tutorial/WelcomeWalkthrough.java  | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index ac624def8..732b7b424 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -75,6 +75,8 @@ 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;
+        } else {
+            // Setup login page from AB tests
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index 373662171..b7b8612bd 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -129,6 +129,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                                             Toast.makeText(WelcomeWalkthrough.this,
                                                     error,
                                                     Toast.LENGTH_LONG).show();
+                                            onAuthError();
                                         }
                                     });
                                 } finally {
@@ -147,17 +148,13 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         rejectQuickLogin.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mAdapter.changeLoginPage(getLoginPageLayout());
-                mPager.setAdapter(mAdapter);
-                mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
-                initializeUI();
+                switchToLoginPage();
             }
         });
     }
 
     private void onAuthTokenSuccess(final String email, final String authToken) {
         runOnUiThread(new Runnable() {
-
             @Override
             public void run() {
                 authenticate(email, email, "", "google", authToken); //$NON-NLS-1$ //$NON-NLS-2$
@@ -165,6 +162,22 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         });
     }
 
+    private void onAuthError() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                switchToLoginPage();
+            }
+        });
+    }
+
+    private void switchToLoginPage() {
+        mAdapter.changeLoginPage(getLoginPageLayout());
+        mPager.setAdapter(mAdapter);
+        mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
+        initializeUI();
+    }
+
     public void onPageChanged(View view, int position) {
         currentPage = position;
         currentView = view;

From b2686e855c45e170dd29ea89e899a8fef9244a28 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 5 Dec 2012 11:54:24 -0800
Subject: [PATCH 5/8] Add AB tests for welcome login layout options

---
 .../astrid/service/StartupService.java        |  2 ++
 .../astrid/service/abtesting/ABTests.java     | 33 +++++++++++++++++++
 .../welcome/tutorial/WelcomePagerAdapter.java | 21 +++++++++++-
 3 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index f42ee0d74..ca306f1f0 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -201,6 +201,8 @@ public class StartupService {
 
         final int finalLatestVersion = latestSetVersion;
 
+        abTests.externalInit(context);
+
         abChooser.makeChoicesForAllTests(latestSetVersion == 0, taskService.getUserActivationStatus());
 
         abTestInvoker.reportAcquisition();
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 87b12f99b..ed98d0f57 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -8,6 +8,11 @@ package com.todoroo.astrid.service.abtesting;
 import java.util.HashMap;
 import java.util.Set;
 
+import android.accounts.Account;
+import android.content.Context;
+
+import com.google.api.client.googleapis.extensions.android2.auth.GoogleAccountManager;
+
 /**
  * Helper class to define options with their probabilities and descriptions
  * @author Sam Bosley <sam@astrid.com>
@@ -20,6 +25,30 @@ public class ABTests {
         initialize();
     }
 
+    /**
+     * Initialization for any tests that require a context or other logic
+     * to be initialized should go here. This method is called from the startup
+     * service before any test choices are made, so it is safe to add
+     * tests here. It's also ok if this method is a no-op sometimes.
+     * @param context
+     */
+    public void externalInit(Context context) {
+        // The outer 'if' statement is to prevent one test from being added one time
+        // and the other from being added later if the accounts changed
+        if (ABChooser.readChoiceForTest(AB_NEW_LOGIN_NO_GOOGLE) == ABChooser.NO_OPTION
+                && ABChooser.readChoiceForTest(AB_NEW_LOGIN_YES_GOOGLE) == ABChooser.NO_OPTION) {
+            GoogleAccountManager am = new GoogleAccountManager(context);
+            Account[] accounts = am.getAccounts();
+            if (accounts == null || accounts.length == 0) {
+                addTest(AB_NEW_LOGIN_NO_GOOGLE, new int[] { 1, 1 },
+                        new int[] { 1, 0 }, new String[] { "old-welcome", "new-welcome" });  //$NON-NLS-1$//$NON-NLS-2$
+            } else {
+                addTest(AB_NEW_LOGIN_YES_GOOGLE, new int[] { 1, 1, 1 },
+                        new int[] { 1, 0, 0 }, new String[] { "old-welcome", "new-welcome", "new-quick-welcome" });  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
+            }
+        }
+    }
+
     /**
      * Gets the integer array of weighted probabilities for an option key
      * @param key
@@ -127,6 +156,10 @@ public class ABTests {
 
     public static final String AB_DEFAULT_EDIT_TAB = "android_default_edit_tab"; //$NON-NLS-1$
 
+    public static final String AB_NEW_LOGIN_NO_GOOGLE = "android_new_login_n_google"; //$NON-NLS-1$
+
+    public static final String AB_NEW_LOGIN_YES_GOOGLE = "android_new_login_y_google"; //$NON-NLS-1$
+
     private void initialize() {
 
         addTest(AB_FEATURED_LISTS, new int[] { 1, 1 },
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index 732b7b424..b008ac1d1 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -21,6 +21,8 @@ import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
+import com.todoroo.astrid.service.abtesting.ABChooser;
+import com.todoroo.astrid.service.abtesting.ABTests;
 import com.viewpagerindicator.TitleProvider;
 
 public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
@@ -59,7 +61,7 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
         R.layout.welcome_walkthrough_page,
-        R.layout.welcome_walkthrough_simple_login,
+        R.layout.welcome_walkthrough_login_page,
     };
 
     private final Context context;
@@ -77,6 +79,23 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
             body[body.length - 1] = R.string.welcome_body_7_return;
         } else {
             // Setup login page from AB tests
+            if (ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_YES_GOOGLE) != ABChooser.NO_OPTION) {
+                int choice = ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_YES_GOOGLE);
+                switch (choice) {
+                case 1:
+                    layouts[layouts.length - 1] = R.layout.actfm_login_activity;
+                    break;
+                case 2:
+                    layouts[layouts.length - 1] = R.layout.welcome_walkthrough_simple_login;
+                    break;
+                default:
+                    break;
+                }
+            } else if (ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_NO_GOOGLE) != ABChooser.NO_OPTION) {
+                int choice = ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_NO_GOOGLE);
+                if (choice == 1)
+                    layouts[layouts.length - 1] = R.layout.actfm_login_activity;
+            }
         }
     }
 

From 2c87c840a0e3cfb88a5c40eee74c299488f8d46b Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 5 Dec 2012 12:11:26 -0800
Subject: [PATCH 6/8] Fixes to logic when setting up the welcome pager adapter

---
 .../astrid/welcome/tutorial/WelcomePagerAdapter.java     | 9 +++++++--
 .../astrid/welcome/tutorial/WelcomeWalkthrough.java      | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index b008ac1d1..f4af8a9fa 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -64,6 +64,8 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
         R.layout.welcome_walkthrough_login_page,
     };
 
+    public int fallbackLoginPage;
+
     private final Context context;
     public WelcomeWalkthrough parent;
     @Autowired ActFmPreferenceService actFmPreferenceService;
@@ -83,18 +85,21 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
                 int choice = ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_YES_GOOGLE);
                 switch (choice) {
                 case 1:
-                    layouts[layouts.length - 1] = R.layout.actfm_login_activity;
+                    fallbackLoginPage = layouts[layouts.length - 1] = R.layout.actfm_login_activity;
                     break;
                 case 2:
                     layouts[layouts.length - 1] = R.layout.welcome_walkthrough_simple_login;
+                    fallbackLoginPage = R.layout.actfm_login_activity;
                     break;
                 default:
+                    fallbackLoginPage = layouts[layouts.length - 1];
                     break;
                 }
             } else if (ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_NO_GOOGLE) != ABChooser.NO_OPTION) {
                 int choice = ABChooser.readChoiceForTest(ABTests.AB_NEW_LOGIN_NO_GOOGLE);
+                fallbackLoginPage = layouts[layouts.length - 1];
                 if (choice == 1)
-                    layouts[layouts.length - 1] = R.layout.actfm_login_activity;
+                    fallbackLoginPage = layouts[layouts.length - 1] = R.layout.actfm_login_activity;
             }
         }
     }
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index b7b8612bd..cf325abec 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -78,7 +78,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
     }
 
     private int getLoginPageLayout() {
-        return R.layout.actfm_login_activity;
+        return mAdapter.fallbackLoginPage;
     }
 
     @Override

From d8bf2724c94fa3acadbfe21dd766c154221c77ea Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 5 Dec 2012 14:44:43 -0800
Subject: [PATCH 7/8] Polish to the landscape login activity

---
 .../res/layout-land/actfm_login_activity.xml  | 187 +++++++++---------
 astrid/res/layout/actfm_login_activity.xml    |   2 +
 2 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/astrid/res/layout-land/actfm_login_activity.xml b/astrid/res/layout-land/actfm_login_activity.xml
index 16e756e9e..4fa1a4c77 100644
--- a/astrid/res/layout-land/actfm_login_activity.xml
+++ b/astrid/res/layout-land/actfm_login_activity.xml
@@ -12,121 +12,116 @@
     android:background="@drawable/astrid_com_gradient"
     android:orientation="vertical" >
 
-    <TextView
-        android:id="@+id/intro"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_alignParentLeft="true"
-        android:textSize="16sp"
-        android:paddingTop="20dip"
-        android:textColor="#ffffff"
-        android:text="@string/actfm_ALA_body" />
-
-    <TextView
-        android:id="@+id/error"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:textColor="#ff0000"
-        android:textSize="16sp"
-        android:textStyle="bold" />
-
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="horizontal" >
-

-        <LinearLayout
+        android:layout_weight="1"
+        android:orientation="horizontal">

+        <ImageView
+            android:id="@+id/logo"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_weight="50"
-            android:orientation="vertical" >
-



-            <ImageView
-                android:id="@+id/logo"
-                android:layout_width="fill_parent"
-                android:layout_height="110dip"
-                android:scaleType="fitCenter"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip"
-                android:paddingBottom="10dip"
-                android:src="@drawable/astrid_com_logo"
-                android:layout_gravity="center"
-                android:layout_weight="1" />
-        </LinearLayout>
-



+            android:scaleType="center"
+            android:paddingLeft="20dip"
+            android:paddingRight="20dip"
+            android:paddingBottom="10dip"
+            android:src="@drawable/astrid_com_logo_new"
+            android:layout_weight="1" />


         <LinearLayout
             android:id="@+id/LinearLayout1"
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
-            android:layout_weight="50"
+            android:layout_weight="1"
             android:gravity="center_vertical"
             android:paddingTop="5dip" >
 
-            <Button
-                android:id="@+id/gg_login"
-                android:layout_width="match_parent"
-                android:layout_height="45dip"
-                android:layout_marginLeft="15dip"
-                android:layout_marginRight="15dip"
-                android:drawableLeft="@drawable/google"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip"
-                android:text="@string/actfm_ALA_gg_login"
-                android:textSize="12sp"
-                android:layout_gravity="center_horizontal" />
-
             <com.facebook.android.LoginButton
-                android:id="@+id/fb_login"
-                android:layout_width="match_parent"
-                android:layout_height="45dip"
-                android:layout_marginLeft="15dip"
-                android:layout_marginRight="15dip"
-                android:drawableLeft="@drawable/facebook"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip"
-                android:text="@string/actfm_ALA_fb_login"
-                android:textSize="12sp"
-                android:layout_gravity="center_horizontal" />
-
-            <Button
-                android:id="@+id/pw_signup"
-                android:layout_width="match_parent"
-                android:layout_height="45dp"
-                android:paddingLeft="17dip"
-                android:paddingRight="20dip"
-                android:layout_marginLeft="15dip"
-                android:layout_marginRight="15dip"
-                android:drawableLeft="@drawable/notif_astrid"
-                android:textSize="12sp"
-                android:text="@string/welcome_login_pw"
-                android:layout_gravity="center_horizontal" />
+	          android:id="@+id/fb_login"
+	          android:layout_width="fill_parent"
+	          android:layout_height="45dip"
+	          android:layout_marginLeft="15dip"
+	          android:layout_marginRight="15dip"
+	          android:layout_marginBottom="15dip"
+	          android:layout_marginTop="15dip"
+	          android:paddingLeft="70dip"
+	          android:textSize="14sp"
+	          android:gravity="left|center_vertical"
+	          android:background="@drawable/fb_login_background"
+	          android:textColor="@android:color/white"
+	          android:text="@string/actfm_ALA_fb_login" />
             
-            <TextView
-	            android:id="@+id/pw_login"
-	            android:layout_width="wrap_content"
-	            android:layout_height="35dip"
-	            android:gravity="center"
-	            android:layout_gravity="center_horizontal"
-	            android:layout_above="@id/tos" 
-	            android:textColor="#444"
-	            android:textSize="16sp"
-	            android:text="@string/welcome_sign_in"/>
+            <Button
+	          android:id="@+id/gg_login"
+	          android:layout_width="fill_parent"
+	          android:layout_height="45dip"
+	          android:layout_marginLeft="15dip"
+	          android:layout_marginRight="15dip"
+	          android:paddingLeft="70dip"
+	          android:textSize="14sp"
+	          android:gravity="left|center_vertical"
+	          android:background="@drawable/google_login_background"
+	          android:textColor="@android:color/white"
+	          android:text="@string/actfm_ALA_gg_login" />
+
 
             <TextView
-		          android:id="@+id/tos"
-		          android:layout_width="fill_parent"
-		          android:layout_height="35dip"
-		          android:layout_above="@id/gg_login"
-		          android:gravity="center"
-		          android:paddingLeft="20dip"
-		          android:paddingRight="20dip"
-		          android:textSize="12.5sp"
-		          android:textColor="#ffffff" /> 
+	          android:id="@+id/tos"
+	          android:layout_width="fill_parent"
+	          android:layout_height="35dip"
+	          android:layout_above="@id/gg_login"
+	          android:gravity="center"
+	          android:paddingLeft="20dip"
+	          android:paddingRight="20dip"
+	          android:textSize="12.5sp"
+	          android:visibility="invisible"
+	          android:textColor="#ffffff" /> 
         </LinearLayout>
 
     </LinearLayout>
+    
+    <LinearLayout 
+        android:layout_width="fill_parent"
+        android:layout_height="45dip"
+        android:orientation="horizontal">
+        <TextView
+          android:id="@+id/login_later"
+          android:text="@string/welcome_login_later"
+          android:layout_width="fill_parent"
+          android:layout_height="45dip"
+          android:gravity="center"
+          android:layout_weight="1"
+          android:textSize="16sp"
+          android:textColor="@android:color/white" 
+          android:visibility="gone"/>
+        <TextView
+          android:id="@+id/pw_login"
+          android:layout_width="fill_parent"
+          android:layout_height="45dip"
+          android:layout_weight="1"
+          android:gravity="center"
+          android:textColor="@android:color/white"
+          android:textSize="16sp"
+          android:text="@string/welcome_sign_in"/>
+        <TextView
+          android:id="@+id/pw_signup"
+          android:layout_width="fill_parent"
+          android:layout_height="45dip"
+          android:layout_weight="1"
+          android:gravity="center"
+          android:textColor="@android:color/white"
+          android:textSize="16sp" 
+          android:text="@string/welcome_login_pw"/>    
+        
+    </LinearLayout>
+    <TextView
+        android:id="@+id/error"
+        android:layout_width="fill_parent"
+        android:layout_height="45dip"
+        android:gravity="center"
+        android:textColor="#ff0000"
+        android:textSize="16sp"
+        android:textStyle="bold" 
+        android:visibility="gone"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/layout/actfm_login_activity.xml b/astrid/res/layout/actfm_login_activity.xml
index f935d47ae..541ab3fe3 100644
--- a/astrid/res/layout/actfm_login_activity.xml
+++ b/astrid/res/layout/actfm_login_activity.xml
@@ -42,6 +42,7 @@
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
           android:layout_marginBottom="15dip"
+          android:paddingLeft="70dip"
           android:textSize="16sp"
           android:gravity="left|center_vertical"
           android:background="@drawable/fb_login_background"
@@ -54,6 +55,7 @@
           android:layout_height="45dip"
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
+          android:paddingLeft="70dip"
           android:textSize="16sp"
           android:gravity="left|center_vertical"
           android:background="@drawable/google_login_background"

From 5ae2b5f9e57336290b23f30b15071f502b2d87ab Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 6 Dec 2012 14:38:29 -0800
Subject: [PATCH 8/8] Record a couple new statistics with the new login screens

---
 .../src/com/todoroo/astrid/service/StatisticsConstants.java   | 3 +++
 .../todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java   | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java b/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
index 1c5718e8f..777f03aa5 100644
--- a/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
+++ b/astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
@@ -78,6 +78,9 @@ public class StatisticsConstants {
     public static final String PREMIUM_PAGE_VIEWED = "premium-page-viewed";
     public static final String FEATURED_LIST_CLONED = "featured-list-cloned";
 
+    public static final String ACTFM_LOGIN_SIMPLE = "actfm-login-simple";
+    public static final String ACTFM_LOGIN_SIMPLE_REJECTED = "actfm-login-simple-rejected";
+
     public static final String SUBTASKS_HAS_TASKS = "subtasks-has-tasks";
     public static final String SUBTASKS_ORDER_USED = "subtasks-order-used";
     public static final String SUBTASKS_INDENT_USED = "subtasks-indent-used";
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index cf325abec..588078234 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -32,6 +32,8 @@ import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.astrid.actfm.ActFmGoogleAuthActivity;
 import com.todoroo.astrid.actfm.ActFmLoginActivity;
 import com.todoroo.astrid.gtasks.auth.ModernAuthManager;
+import com.todoroo.astrid.service.StatisticsConstants;
+import com.todoroo.astrid.service.StatisticsService;
 import com.viewpagerindicator.CirclePageIndicator;
 import com.viewpagerindicator.PageIndicator;
 
@@ -104,6 +106,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         simpleLogin.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
+                StatisticsService.reportEvent(StatisticsConstants.ACTFM_LOGIN_SIMPLE);
                 final ProgressDialog pd = DialogUtilities.progressDialog(WelcomeWalkthrough.this, getString(R.string.gtasks_GLA_authenticating));
                 pd.show();
                 GoogleAccountManager accountManager = new GoogleAccountManager(WelcomeWalkthrough.this);
@@ -148,6 +151,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         rejectQuickLogin.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
+                StatisticsService.reportEvent(StatisticsConstants.ACTFM_LOGIN_SIMPLE_REJECTED);
                 switchToLoginPage();
             }
         });