Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1210386 - Link "Make Firefox Default Browser" to Settings page. r=sebastian

Browse Source 
MozReview-Commit-ID: 9nrVnUaqO7K

--HG--
extra : rebase_source : 0eba2c2f543ed190c2c6d87252ef227f60dc6d87
This commit is contained in:
Margaret Leibovic 2016-04-07 13:00:55 -04:00
parent 172b0b3053
commit e34bd976e9
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/locales/en-US/android_strings.dtd
View File

@ -349,7 +349,7 @@ size. -->
<!ENTITY pref_private_data_downloadFiles2 "Downloads">
<!ENTITY pref_private_data_syncedTabs "Synced tabs">
<!ENTITY pref_default_browser "Make default browser">
<!ENTITY pref_about_firefox "About &brandShortName;">
<!ENTITY pref_vendor_faqs "FAQs">
<!ENTITY pref_vendor_feedback "Give feedback">

5
mobile/android/base/resources/xml/preferences.xml
View File

@ -70,6 +70,11 @@
gecko:entryKeys="@array/pref_private_data_keys"
gecko:initialValues="@array/pref_private_data_defaults" />
<org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.default_browser.link"
android:title="@string/pref_default_browser"
android:persistent="false"
url="https://support.mozilla.org/kb/make-firefox-default-browser-android?utm_source=inproduct&amp;utm_medium=settings&amp;utm_campaign=mobileandroid"/>
<PreferenceScreen android:title="@string/pref_category_vendor"
android:summary="@string/pref_category_vendor_summary"
android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >

16
mobile/android/base/strings.xml.in
View File

@ -76,13 +76,6 @@
<string name="url_bar_default_text">&url_bar_default_text2;</string>
<!-- https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_source=feedback-settings
This should be kept in sync with the "app.feedbackURL" pref defined in mobile.js -->
<string name="feedback_link">https://input.mozilla.org/feedback/android/&formatS1;/&formatS2;/?utm_source=feedback-settings</string>
<!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/faq -->
<string name="faq_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/faq</string>
<!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/ -->
<string name="help_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/</string>
<string name="help_menu">&help_menu;</string>
@ -306,9 +299,18 @@
<string name="content_notification_action_settings">&content_notification_action_settings;</string>
<string name="content_notification_updated_on">&content_notification_updated_on;</string>
<string name="pref_default_browser">&pref_default_browser;</string>
<string name="pref_about_firefox">&pref_about_firefox;</string>
<string name="pref_vendor_faqs">&pref_vendor_faqs;</string>
<!-- https://support.mozilla.org/1/mobile/%VERSION%/%OS%/%LOCALE%/faq -->
<string name="faq_link">https://support.mozilla.org/1/mobile/&formatS1;/&formatS2;/&formatS3;/faq</string>
<string name="pref_vendor_feedback">&pref_vendor_feedback;</string>
<!-- https://input.mozilla.org/feedback/android/%VERSION%/%CHANNEL%/?utm_source=feedback-settings
This should be kept in sync with the "app.feedbackURL" pref defined in mobile.js -->
<string name="feedback_link">https://input.mozilla.org/feedback/android/&formatS1;/&formatS2;/?utm_source=feedback-settings</string>
<string name="pref_dialog_set_default">&pref_dialog_set_default;</string>
<string name="pref_default">&pref_dialog_default;</string>