Bug 962542 - Linkify 'getting started' support link. r=nalexander

This commit is contained in:
Richard Newman 2014-01-28 15:27:57 -08:00
Родитель 82ec5699db
Коммит 986638b5b4
3 изменённых файлов: 7 добавлений и 2 удалений

Просмотреть файл

@ -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() {

Просмотреть файл

@ -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'>

Просмотреть файл

@ -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>