Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1261137 - Add groups in Settings > Advanced. r=sebastian

Browse Source 
MozReview-Commit-ID: 2jUL0PJ33bq

--HG--
extra : rebase_source : b715458d0ab6dd137e42467f98ed6a94ffa719c1
This commit is contained in:
Margaret Leibovic 2016-04-12 17:52:47 -04:00
parent bc99856818
commit 549c799b69
3 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,6 +219,10 @@
<!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party">
<!ENTITY pref_cookies_disabled "Disabled">
<!ENTITY pref_category_data_saver "Data saver">
<!ENTITY pref_category_media "Media">
<!ENTITY pref_category_developer_tools "Developer tools">
<!ENTITY pref_tap_to_load_images_title2 "Show images">
<!ENTITY pref_tap_to_load_images_enabled "Always">
<!ENTITY pref_tap_to_load_images_data "Only over Wi-Fi">

66
mobile/android/base/resources/xml/preferences_advanced.xml
View File

@ -32,42 +32,52 @@
android:entryValues="@array/pref_restore_values"
android:persistent="true" />
<ListPreference android:key="browser.image_blocking"
android:title="@string/pref_tap_to_load_images_title2"
android:entries="@array/pref_browser_image_blocking_entries"
android:entryValues="@array/pref_browser_image_blocking_values"
android:persistent="false" />
<SwitchPreference android:key="browser.display.use_document_fonts"
android:title="@string/pref_show_web_fonts"
android:summary="@string/pref_show_web_fonts_summary"/>
<ListPreference android:key="plugin.enable"
android:title="@string/pref_plugins"
android:entries="@array/pref_plugins_entries"
android:entryValues="@array/pref_plugins_values"
android:persistent="false" />
<SwitchPreference android:key="media.autoplay.enabled"
android:title="@string/pref_media_autoplay_enabled"
android:summary="@string/pref_media_autoplay_enabled_summary" />
<ListPreference android:key="browser.menu.showCharacterEncoding"
android:title="@string/pref_char_encoding"
android:entries="@array/pref_char_encoding_entries"
android:entryValues="@array/pref_char_encoding_values"
android:persistent="false" />
<SwitchPreference android:key="devtools.remote.usb.enabled"
android:title="@string/pref_developer_remotedebugging_usb" />
<PreferenceCategory android:title="@string/pref_category_data_saver">
<ListPreference android:key="browser.image_blocking"
android:title="@string/pref_tap_to_load_images_title2"
android:entries="@array/pref_browser_image_blocking_entries"
android:entryValues="@array/pref_browser_image_blocking_values"
android:persistent="false" />
<SwitchPreference android:key="devtools.remote.wifi.enabled"
android:title="@string/pref_developer_remotedebugging_wifi" />
<SwitchPreference android:key="browser.display.use_document_fonts"
android:title="@string/pref_show_web_fonts"
android:summary="@string/pref_show_web_fonts_summary"/>
<org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
android:title="@string/pref_learn_more"
android:persistent="false"
url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_category_media">
<ListPreference android:key="plugin.enable"
android:title="@string/pref_plugins"
android:entries="@array/pref_plugins_entries"
android:entryValues="@array/pref_plugins_values"
android:persistent="false" />
<SwitchPreference android:key="media.autoplay.enabled"
android:title="@string/pref_media_autoplay_enabled"
android:summary="@string/pref_media_autoplay_enabled_summary" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/pref_category_developer_tools">
<SwitchPreference android:key="devtools.remote.usb.enabled"
android:title="@string/pref_developer_remotedebugging_usb" />
<SwitchPreference android:key="devtools.remote.wifi.enabled"
android:title="@string/pref_developer_remotedebugging_wifi" />
<org.mozilla.gecko.preferences.AlignRightLinkPreference android:key="android.not_a_preference.remote_debugging.link"
android:title="@string/pref_learn_more"
android:persistent="false"
url="https://developer.mozilla.org/docs/Tools/Remote_Debugging/Debugging_Firefox_for_Android_with_WebIDE" />
</PreferenceCategory>
</PreferenceScreen>

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

@ -203,6 +203,10 @@
<string name="pref_cookies_not_accept_foreign">&pref_cookies_not_accept_foreign;</string>
<string name="pref_cookies_disabled">&pref_cookies_disabled;</string>
<string name="pref_category_data_saver">&pref_category_data_saver;</string>
<string name="pref_category_media">&pref_category_media;</string>
<string name="pref_category_developer_tools">&pref_category_developer_tools;</string>
<string name="pref_tap_to_load_images_title2">&pref_tap_to_load_images_title2;</string>
<string name="pref_tap_to_load_images_enabled">&pref_tap_to_load_images_enabled;</string>
<string name="pref_tap_to_load_images_data">&pref_tap_to_load_images_data;</string>