Bug 1445798 - Add Leanplum settings opt-out strings needed for bug #1454686; r?mcomella draft
authorPetru Lingurar <petru.lingurar@softvision.ro>
Mon, 23 Apr 2018 18:07:42 +0300
changeset 786554 4928bbfd289f8f8d79fe14324d0acea5bc9dae9a
parent 786478 dfb15917c057f17e5143f7d7c6e1972ba53efc49
push id107511
push userplingurar@mozilla.com
push dateMon, 23 Apr 2018 15:12:19 +0000
bugs1445798, 1454686
Bug 1445798 - Add Leanplum settings opt-out strings needed for bug #1454686; r?mcomella To allow users to opt-out from receiving LeanPlum messages we need a new setting added. This are the Strings for the title and summary of that setting. Localization notes also added as this Strings will ship before the feature. Suppressed all UnusedResources Lint errors for Strings until the patch for #1454686 lands as in-place suppression caused other errors. Ran Lint locally and the build passed. MozReview-Commit-ID: 9Kx567ruY3n *** Bug 1445798 - Suppress UnusedResources Lint error until the patch for #1454686 lands; r?mcomella
--- a/mobile/android/app/lint.xml
+++ b/mobile/android/app/lint.xml
@@ -236,16 +236,19 @@
     <issue id="UnlocalizedSms" severity="error" />
     <issue id="UnusedNamespace" severity="error" />
     <issue id="UnusedQuantity" severity="error" />
     <issue id="UnusedResources" severity="error">
         <!-- The moz.build based build system leaves a .mkdir.done file lying around in the
              preprocessed_resources res/raw folder. Lint reports it as unused. We should get
              rid of the file eventually. See bug 1268948. -->
         <ignore path="**/raw/.mkdir.done" />
+        <!-- Needed to ignore currently unused resources added as per bug 1445798
+             Suppression to be removed along with the patch for bug 1454686 -->
+        <ignore path="**/res/values/strings.xml" />
     <issue id="Usability" severity="error" />
     <issue id="UseCheckPermission" severity="error" />
     <issue id="UseCompoundDrawables" severity="error" />
     <issue id="UselessLeaf" severity="error" />
     <issue id="UsesMinSdkAttributes" severity="error" />
     <issue id="UsingHttp" severity="error" />
     <issue id="ViewHolder" severity="error" />
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -220,17 +220,16 @@
   <string name="pref_tracking_protection_enabled">&pref_tracking_protection_enabled;</string>
   <string name="pref_tracking_protection_enabled_pb">&pref_tracking_protection_enabled_pb;</string>
   <string name="pref_tracking_protection_disabled">&pref_tracking_protection_disabled;</string>
   <string name="pref_whats_new_notification">&pref_whats_new_notification;</string>
   <string name="pref_whats_new_notification_summary">&pref_whats_new_notification_summary;</string>
   <string name="pref_feature_tips_notification">&pref_feature_tips_notification;</string>
   <string name="pref_feature_tips_notification_summary">&pref_feature_tips_notification_summary;</string>
   <string name="pref_category_experimental">&pref_category_experimental;</string>
   <string name="pref_custom_tabs">&pref_custom_tabs2;</string>
   <string name="pref_custom_tabs_summary">&pref_custom_tabs_summary4;</string>