From 986638b5b4c507caa07462ab3e42346ee090ba00 Mon Sep 17 00:00:00 2001
From: Richard Newman <rnewman@mozilla.com>
Date: Tue, 28 Jan 2014 15:27:57 -0800
Subject: [PATCH] Bug 962542 - Linkify 'getting started' support link.
 r=nalexander

---
 .../base/fxa/activities/FxAccountGetStartedActivity.java     | 5 ++++-
 mobile/android/base/locales/en-US/sync_strings.dtd           | 3 ++-
 mobile/android/services/strings.xml.in                       | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java b/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java
index 30ea5c0b6a5b..9150bbd4cb23 100644
--- a/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java
+++ b/mobile/android/base/fxa/activities/FxAccountGetStartedActivity.java
@@ -9,6 +9,7 @@ import org.mozilla.gecko.background.common.log.Logger;
 import org.mozilla.gecko.background.fxa.FxAccountAgeLockoutHelper;
 import org.mozilla.gecko.fxa.FxAccountConstants;
 import org.mozilla.gecko.fxa.authenticator.FxAccountAuthenticator;
+import org.mozilla.gecko.sync.setup.activities.ActivityUtils;
 
 import android.accounts.AccountAuthenticatorActivity;
 import android.content.Intent;
@@ -16,6 +17,7 @@ import android.os.Bundle;
 import android.os.SystemClock;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.TextView;
 
 /**
  * Activity which displays sign up/sign in screen to the user.
@@ -36,7 +38,8 @@ public class FxAccountGetStartedActivity extends AccountAuthenticatorActivity {
     super.onCreate(icicle);
     setContentView(R.layout.fxaccount_get_started);
 
-    // linkifyTextViews(null, new int[] { R.id.old_firefox });
+    TextView oldFirefox = (TextView) findViewById(R.id.old_firefox);
+    ActivityUtils.linkTextView(oldFirefox, R.string.fxaccount_old_firefox, R.string.fxaccount_link_old_firefox);
 
     View button = findViewById(R.id.get_started_button);
     button.setOnClickListener(new OnClickListener() {
diff --git a/mobile/android/base/locales/en-US/sync_strings.dtd b/mobile/android/base/locales/en-US/sync_strings.dtd
index f78003cea652..037a724584bb 100644
--- a/mobile/android/base/locales/en-US/sync_strings.dtd
+++ b/mobile/android/base/locales/en-US/sync_strings.dtd
@@ -131,7 +131,8 @@
 <!ENTITY fxaccount.sign.in 'Sign in'>
 <!ENTITY fxaccount.create.account 'Create an account'>
 
-<!ENTITY fxaccount.old.firefox '&lt;a href="http://mozilla.com"&gt;Using &syncBrand.shortName.label; with an older version of &brandShortName;?&lt;/a&gt;'>
+<!ENTITY fxaccount.link.old.firefox 'https://support.mozilla.org/kb/use-sync-with-an-older-version-of-firefox'>
+<!ENTITY fxaccount.old.firefox 'Using &syncBrand.shortName.label; with an older version of &brandShortName;?'>
 
 <!ENTITY fxaccount.when.were.you.born 'When were you born?'>
 <!ENTITY fxaccount.year.of.birth 'Year of birth'>
diff --git a/mobile/android/services/strings.xml.in b/mobile/android/services/strings.xml.in
index 38a1c997dd99..d95f143e919d 100644
--- a/mobile/android/services/strings.xml.in
+++ b/mobile/android/services/strings.xml.in
@@ -124,6 +124,7 @@
   <string name="fxaccount_sign_in_instead">&fxaccount.sign.in.instead;</string>
   <string name="fxaccount_sign_up_instead">&fxaccount.sign.up.instead;</string>
 
+  <string name="fxaccount_link_old_firefox">&fxaccount.link.old.firefox;</string>
   <string name="fxaccount_old_firefox">&fxaccount.old.firefox;</string>
 
   <string name="fxaccount_options_title">&fxaccount.options.title;</string>