Bug 1260930 - Settings: Add "Logins" group in Settings > Privacy. r?ahunt draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Thu, 31 Mar 2016 20:14:06 +0200
changeset 346279 ac7287caed61a3e39172c740921fa0f8e1a0811a
parent 346278 fcfa820751f17d162aa9574e06ebc0ad324b5762
child 346280 8f03892327e66fafaead6f772e3cd7a2042b27e1
push id14325
push users.kaspari@gmail.com
push dateThu, 31 Mar 2016 18:22:22 +0000
reviewersahunt
bugs1260930
milestone48.0a1
Bug 1260930 - Settings: Add "Logins" group in Settings > Privacy. r?ahunt MozReview-Commit-ID: 41cljy2E1pV
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences_privacy.xml
mobile/android/base/strings.xml.in
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -145,16 +145,17 @@
 <!ENTITY pref_category_search_summary "Customize your search providers">
 <!ENTITY pref_category_accessibility "Accessibility">
 <!ENTITY pref_category_accessibility_summary2 "Text size, zoom, voice input">
 <!ENTITY pref_category_privacy_short "Privacy">
 <!ENTITY pref_category_privacy_summary3 "Tracking, cookies, data choices">
 <!ENTITY pref_category_vendor2 "&vendorShortName; &brandShortName;">
 <!ENTITY pref_category_vendor_summary2 "About &brandShortName;, FAQs, feedback">
 <!ENTITY pref_category_datareporting "Data choices">
+<!ENTITY pref_category_logins "Logins">
 <!ENTITY pref_learn_more "Learn more">
 <!ENTITY pref_category_installed_search_engines "Installed search engines">
 <!ENTITY pref_category_add_search_providers "Add more search providers">
 <!ENTITY pref_category_search_restore_defaults "Restore search engines">
 <!ENTITY pref_search_restore_defaults "Restore defaults">
 <!ENTITY pref_search_restore_defaults_summary "Restore defaults">
 <!-- Localization note (pref_search_hint) : "TIP" as in "hint", "clue" etc. Displayed as an
      advisory message on the customise search providers settings page explaining how to add new
--- a/mobile/android/base/resources/xml/preferences_privacy.xml
+++ b/mobile/android/base/resources/xml/preferences_privacy.xml
@@ -37,42 +37,49 @@
             url="https://support.mozilla.org/kb/firefox-android-tracking-protection" />
 
     <ListPreference android:key="network.cookie.cookieBehavior"
                     android:title="@string/pref_cookies_menu"
                     android:entries="@array/pref_cookies_entries"
                     android:entryValues="@array/pref_cookies_values"
                     android:persistent="false" />
 
-    <org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
-                                                  android:title="@string/pref_manage_logins"
-                                                  url="about:logins"/>
-
-    <CheckBoxPreference android:key="signon.rememberSignons"
-                        android:title="@string/pref_remember_signons"
-                        android:persistent="false" />
-
-    <CheckBoxPreference android:key="privacy.masterpassword.enabled"
-                        android:title="@string/pref_use_master_password"
-                        android:persistent="false" />
-
 
     <!-- This pref is persisted in both Gecko and Java -->
     <org.mozilla.gecko.preferences.ListCheckboxPreference
                         android:key="android.not_a_preference.history.clear_on_exit"
                         gecko:entries="@array/pref_private_data_entries"
                         gecko:entryValues="@array/pref_private_data_values"
                         gecko:initialValues="@array/pref_clear_on_exit_defaults"
 
                         android:title="@string/pref_clear_on_exit_title"
                         android:summary="@string/pref_clear_on_exit_summary2"
 
                         android:dialogTitle="@string/pref_clear_on_exit_dialog_title"
                         android:positiveButtonText="@string/button_set"/>
 
+    <PreferenceCategory android:title="@string/pref_category_logins">
+
+        <org.mozilla.gecko.preferences.LinkPreference
+            android:key="android.not_a_preference.signon.manage"
+            android:title="@string/pref_manage_logins"
+            url="about:logins"/>
+
+        <CheckBoxPreference
+            android:key="signon.rememberSignons"
+            android:title="@string/pref_remember_signons"
+            android:persistent="false" />
+
+        <CheckBoxPreference
+            android:key="privacy.masterpassword.enabled"
+            android:title="@string/pref_use_master_password"
+            android:persistent="false" />
+
+    </PreferenceCategory>
+
     <PreferenceCategory android:key="android.not_a_preference.datareporting.preferences"
                         android:title="@string/pref_category_datareporting">
 
         <CheckBoxPreference android:key="toolkit.telemetry.enabled"
                             android:title="@string/datareporting_telemetry_title"
                             android:summary="@string/datareporting_telemetry_summary" />
 
         <CheckBoxPreference android:key="datareporting.crashreporter.submitEnabled"
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -141,16 +141,17 @@
   <string name="pref_category_search_summary">&pref_category_search_summary;</string>
   <string name="pref_category_accessibility">&pref_category_accessibility;</string>
   <string name="pref_category_accessibility_summary">&pref_category_accessibility_summary2;</string>
   <string name="pref_category_privacy_short">&pref_category_privacy_short;</string>
   <string name="pref_category_privacy_summary">&pref_category_privacy_summary3;</string>
   <string name="pref_category_vendor">&pref_category_vendor2;</string>
   <string name="pref_category_vendor_summary">&pref_category_vendor_summary2;</string>
   <string name="pref_category_datareporting">&pref_category_datareporting;</string>
+  <string name="pref_category_logins">&pref_category_logins;</string>
   <string name="pref_category_installed_search_engines">&pref_category_installed_search_engines;</string>
   <string name="pref_category_add_search_providers">&pref_category_add_search_providers;</string>
   <string name="pref_category_search_restore_defaults">&pref_category_search_restore_defaults;</string>
   <string name="pref_search_restore_defaults">&pref_search_restore_defaults;</string>
   <string name="pref_search_restore_defaults_summary">&pref_search_restore_defaults_summary;</string>
   <string name="pref_search_hint">&pref_search_hint2;</string>
 
   <string name="pref_category_language">&pref_category_language;</string>