diff --git a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusFragment.java b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusFragment.java index 87505470d48..008fc7ccbe6 100644 --- a/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusFragment.java +++ b/mobile/android/services/src/main/java/org/mozilla/gecko/fxa/activities/FxAccountStatusFragment.java @@ -213,6 +213,9 @@ public class FxAccountStatusFragment syncNowPreference = ensureFindPreference("sync_now"); syncNowPreference.setEnabled(true); syncNowPreference.setOnPreferenceClickListener(this); + + ensureFindPreference("linktos").setOnPreferenceClickListener(this); + ensureFindPreference("linkprivacy").setOnPreferenceClickListener(this); } /** @@ -294,6 +297,16 @@ public class FxAccountStatusFragment return true; } + if (TextUtils.equals("linktos", preference.getKey())) { + ActivityUtils.openURLInFennec(getActivity().getApplicationContext(), getResources().getString(R.string.fxaccount_link_tos)); + return true; + } + + if (TextUtils.equals("linkprivacy", preference.getKey())) { + ActivityUtils.openURLInFennec(getActivity().getApplicationContext(), getResources().getString(R.string.fxaccount_link_pn)); + return true; + } + return false; } diff --git a/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml b/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml index 51138a4c37c..570e362cc2d 100644 --- a/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml +++ b/mobile/android/services/src/main/res/xml/fxaccount_status_prefscreen.xml @@ -114,20 +114,16 @@ - - - - - - + + diff --git a/mobile/android/services/strings.xml.in b/mobile/android/services/strings.xml.in index d1cd0360466..b84e5e60193 100644 --- a/mobile/android/services/strings.xml.in +++ b/mobile/android/services/strings.xml.in @@ -28,9 +28,6 @@ &sync.text.tab.not.sent.label; &sync.default.client.name; -@ANDROID_PACKAGE_NAME@ -@ANDROID_PACKAGE_NAME@.App - &fxaccount_full_label;