From de6c1d914a6b22e6cbfe8bbdae09a9c0d8af274b Mon Sep 17 00:00:00 2001
From: Tobrun Van Nuland <tobrun.van.nuland@gmail.com>
Date: Fri, 28 Jul 2017 15:33:30 +0200
Subject: fixup

---
 .../android/MapboxGLAndroidSDKTestApp/build.gradle |  2 +-
 .../lint-baseline-local.xml                        | 15 ------
 .../lint/lint-baseline-ci.xml                      | 55 +++++++++-------------
 3 files changed, 23 insertions(+), 49 deletions(-)

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
index 1e4af3acf6..360cb36067 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/platform/android/MapboxGLAndroidSDKTestApp/build.gradle
@@ -28,7 +28,7 @@ android {
         baseline file("lint-baseline-local.xml")
         checkAllWarnings true
         warningsAsErrors true
-        disable  'MissingTranslation', 'GoogleAppIndexingWarning', 'UnpackedNativeCode'
+        disable  'MissingTranslation', 'GoogleAppIndexingWarning', 'UnpackedNativeCode', 'IconDipSize'
     }
 
     buildTypes {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml b/platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml
index 3e66b617b2..e3c5abce4f 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/lint-baseline-local.xml
@@ -56,21 +56,6 @@
             column="55"/>
     </issue>
 
-    <issue
-        id="IconDipSize"
-        message="The image `icon_burned.png` varies significantly in its density-independent (dip) size across the various density versions: drawable-hdpi/icon_burned.png: 64x64 dp (96x96 px), drawable-xxxhdpi/icon_burned.png: 48x48 dp (192x192 px), drawable-xxhdpi/icon_burned.png: 48x48 dp (144x144 px), drawable-xhdpi/icon_burned.png: 48x48 dp (96x96 px), drawable-mdpi/icon_burned.png: 48x48 dp (48x48 px)">
-        <location
-            file="src/main/res/drawable-mdpi/icon_burned.png"/>
-        <location
-            file="src/main/res/drawable-xhdpi/icon_burned.png"/>
-        <location
-            file="src/main/res/drawable-xxhdpi/icon_burned.png"/>
-        <location
-            file="src/main/res/drawable-xxxhdpi/icon_burned.png"/>
-        <location
-            file="src/main/res/drawable-hdpi/icon_burned.png"/>
-    </issue>
-
     <issue
         id="IconDuplicatesConfig"
         message="The `icon_burned.png` icon has identical contents in the following configuration folders: drawable-hdpi, drawable-xhdpi">
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml b/platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml
index d2fdb3d34b..64e3d41bcc 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/lint/lint-baseline-ci.xml
@@ -6,61 +6,50 @@
     from lint-baseline-local.xml file) you should remove it too from
     lint-baseline-ci.xml (THIS FILE) which is the only one included in the repo.
     Eventually, it'll be removed (when we remove all current lint errors included). -->
-<issues format="4" by="lint 2.3.1">
-
+<issues by="lint 2.3.1" format="4">
+    
     <issue
-        id="UnusedResources"
-        message="The resource `R.string.mapbox_access_token` appears to be unused"
-        errorLine1="    &lt;string name=&quot;mapbox_access_token&quot;>YOUR_MAPBOX_ACCESS_TOKEN_GOES_HERE&lt;/string>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/res/values/developer-config.xml"
-            line="3"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `#cccc` with a theme that also paints a background (inferred theme is `@style/AppTheme`)"
         errorLine1="    android:background=&quot;#cccc&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~"
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `#cccc` with a theme that also paints a background (inferred theme is `@style/AppTheme`)">
         <location
+            column="5"
             file="src/main/res/layout/drawer_navigation_drawer.xml"
-            line="4"
-            column="5"/>
+            line="4"/>
     </issue>
 
     <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `?android:attr/selectableItemBackground` with a theme that also paints a background (inferred theme is `@style/AppTheme`)"
         errorLine1="    android:background=&quot;?android:attr/selectableItemBackground&quot;"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `?android:attr/selectableItemBackground` with a theme that also paints a background (inferred theme is `@style/AppTheme`)">
         <location
+            column="5"
             file="src/main/res/layout/item_main_feature.xml"
-            line="6"
-            column="5"/>
+            line="6"/>
     </issue>
 
     <issue
-        id="Overdraw"
-        message="Possible overdraw: Root element paints background `@color/mapboxGreen` with a theme that also paints a background (inferred theme is `@style/AppTheme`)"
         errorLine1="    android:background=&quot;@color/mapboxGreen&quot;>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
+        id="Overdraw"
+        message="Possible overdraw: Root element paints background `@color/mapboxGreen` with a theme that also paints a background (inferred theme is `@style/AppTheme`)">
         <location
+            column="5"
             file="src/main/res/layout/view_text_marker.xml"
-            line="5"
-            column="5"/>
+            line="5"/>
     </issue>
 
     <issue
-        id="TypographyQuotes"
-        message="Replace straight quotes (&apos;&apos;) with directional quotes (‘’, &amp;#8216; and &amp;#8217;) ?"
         errorLine1="    &lt;string name=&quot;mapbox_attributionTelemetryMessage&quot;>Estàs ajudant a millorar els mapes d\&apos;OpenStreetMap i de Mapbox aportant dades d\&apos;ús anònimes.&lt;/string>"
-        errorLine2="                                                      ^">
+        errorLine2="                                                      ^"
+        id="TypographyQuotes"
+        message="Replace straight quotes (&apos;&apos;) with directional quotes (‘’, &amp;#8216; and &amp;#8217;) ?">
         <location
+            column="55"
             file="src/main/res/values-ca/strings.xml"
-            line="9"
-            column="55"/>
+            line="9"/>
     </issue>
 
     <issue
-- 
cgit v1.2.1