Bug 1445798 - Add Leanplum settings opt-out strings needed for bug #1454686; r=mcomella
authorPetru Lingurar <petru.lingurar@softvision.ro>
Mon, 23 Apr 2018 19:09:13 +0300
changeset 415887 1e5514bef692f08ee0bce003f6f1c2c256cf808c
parent 415886 5cb3b369f134c8dd1f46498fb12f58b92245fd5b
child 415888 828caab5032d535314798a67eda85347ef440ab7
push id33911
push usercsabou@mozilla.com
push dateFri, 27 Apr 2018 10:01:39 +0000
treeherdermozilla-central@822936017145 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcomella
bugs1445798, 1454686
milestone61.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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. Decided to suppress all UnusedResources Lint errors for android strings until the patch for #1454686 lands as using in-line suppression caused other errors. Ran Lint locally, the build passed. MozReview-Commit-ID: 9Kx567ruY3n ***
mobile/android/app/lint.xml
mobile/android/base/strings.xml.in
--- 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 when the along with the ptch for bug 1454686 -->
+        <ignore path="**/res/values/strings.xml" />
     </issue>
     <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>