Bug 1261819 - Add summary to "Notifications" setting. r?grisha draft
authorSebastian Kaspari <s.kaspari@gmail.com>
Tue, 05 Apr 2016 13:13:56 +0200
changeset 347596 838c70cf6d03144d36bf921bd3f0e9b1eb20426d
parent 347595 28437d4df0165d9cf028c00eae570664de356972
child 517667 f681d27c691e30455387bdd71d1fbdc0b4c69590
push id14620
push users.kaspari@gmail.com
push dateTue, 05 Apr 2016 11:14:22 +0000
reviewersgrisha
bugs1261819
milestone48.0a1
Bug 1261819 - Add summary to "Notifications" setting. r?grisha MozReview-Commit-ID: 5zLWKNlMNVr
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/resources/xml/preferences.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
@@ -161,16 +161,17 @@
      advisory message on the customise search providers settings page explaining how to add new
      search providers.
      The &formatI; in the string will be replaced by a small image of the icon described, and can be moved to wherever
      it is applicable. -->
 <!ENTITY pref_search_hint2 "TIP: Add any website to your list of search providers by long-pressing on its search field and then touching the &formatI; icon.">
 <!ENTITY pref_category_advanced "Advanced">
 <!ENTITY pref_category_advanced_summary2 "Restore tabs, plugins, developer tools">
 <!ENTITY pref_category_notifications "Notifications">
+<!ENTITY pref_category_notifications_summary "New features, website updates">
 <!ENTITY pref_content_notifications "Website updates">
 <!ENTITY pref_content_notifications_summary2 "Discover new content from supported sites">
 <!ENTITY pref_developer_remotedebugging_usb "Remote debugging via USB">
 <!ENTITY pref_developer_remotedebugging_wifi "Remote debugging via Wi-Fi">
 <!ENTITY pref_developer_remotedebugging_wifi_disabled_summary "Wi-Fi debugging requires your device to have a QR code reader app installed.">
 <!ENTITY pref_remember_signons2 "Remember logins">
 <!ENTITY pref_manage_logins "Manage logins">
 
--- a/mobile/android/base/resources/xml/preferences.xml
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -43,16 +43,17 @@
     <PreferenceScreen android:title="@string/pref_category_accessibility"
                       android:summary="@string/pref_category_accessibility_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_accessibility" />
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_notifications"
+        android:summary="@string/pref_category_notifications_summary"
         android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment">
         <extra android:name="resource"
             android:value="preferences_notifications"/>
     </PreferenceScreen>
 
     <PreferenceScreen android:title="@string/pref_category_advanced"
                       android:summary="@string/pref_category_advanced_summary"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment"
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -161,16 +161,17 @@
 
   <string name="pref_category_advanced">&pref_category_advanced;</string>
   <string name="pref_category_advanced_summary">&pref_category_advanced_summary2;</string>
   <string name="pref_developer_remotedebugging_usb">&pref_developer_remotedebugging_usb;</string>
   <string name="pref_developer_remotedebugging_wifi">&pref_developer_remotedebugging_wifi;</string>
   <string name="pref_developer_remotedebugging_wifi_disabled_summary">&pref_developer_remotedebugging_wifi_disabled_summary;</string>
 
   <string name="pref_category_notifications">&pref_category_notifications;</string>
+  <string name="pref_category_notifications_summary">&pref_category_notifications_summary;</string>
   <string name="pref_content_notifications">&pref_content_notifications;</string>
   <string name="pref_content_notifications_summary">&pref_content_notifications_summary2;</string>
 
   <string name="pref_category_home">&pref_category_home;</string>
   <string name="pref_category_home_summary">&pref_category_home_summary;</string>
   <string name="pref_category_home_panels">&pref_category_home_panels;</string>
   <string name="pref_home_updates_wifi">&pref_home_updates_wifi;</string>
   <string name="pref_category_home_add_ons">&pref_category_home_add_ons;</string>