From aa32b41b59a88fa41cec4cd7f4db775af9bec5e5 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Thu, 26 Feb 2015 11:32:35 -0800
Subject: [PATCH] Fix all lint errors

---
 android/java/MapboxGLAndroidSDK/build.gradle                | 2 +-
 android/java/MapboxGLAndroidSDKTestApp/build.gradle         | 6 +++---
 .../MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml  | 3 ++-
 .../src/main/res/layout/fragment_main.xml                   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/java/MapboxGLAndroidSDK/build.gradle b/android/java/MapboxGLAndroidSDK/build.gradle
index 40287c953..192bc2bd7 100644
--- a/android/java/MapboxGLAndroidSDK/build.gradle
+++ b/android/java/MapboxGLAndroidSDK/build.gradle
@@ -55,7 +55,7 @@ android {
     lintOptions {
         checkAllWarnings true
         warningsAsErrors true
-        disable 'IconMissingDensityFolder'
+        disable 'InvalidPackage'
     }
 
     buildTypes {
diff --git a/android/java/MapboxGLAndroidSDKTestApp/build.gradle b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
index 08b78df6b..1aac49887 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/build.gradle
+++ b/android/java/MapboxGLAndroidSDKTestApp/build.gradle
@@ -57,9 +57,9 @@ android {
 
     lintOptions {
         checkAllWarnings true
-        disable 'UnusedAttribute'
-        abortOnError false
-        //disable 'IconDensities'
+        warningsAsErrors true
+        disable 'IconDensities'
+        disable 'InvalidPackage'
     }
 
     buildTypes {
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
index 92c69783a..901a63f57 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
     package="com.mapbox.mapboxgl.testapp">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -10,6 +10,7 @@
         android:icon="@drawable/icon_burned"
         android:label="@string/app_name"
         android:theme="@style/AppTheme"
+        tools:ignore="UnusedAttribute"
         android:supportsRtl="true">
         <activity
             android:name="com.mapbox.mapboxgl.testapp.MainActivity"
diff --git a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
index 8745bd68e..f303a02f5 100644
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/res/layout/fragment_main.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.mapbox.mapboxgl.views.MapView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"
+<com.mapbox.mapboxgl.views.MapView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />