From 357fc5e2f1a6e72bb3e5ffdd7e9185abbdf3a329 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Wed, 14 May 2014 23:27:20 +0200
Subject: [PATCH] Fixed lint warnings.

---
 build.gradle                                         | 12 ++++++++++--
 src/main/AndroidManifest.xml                         |  9 ++++++---
 .../nutomic/controldlna/gui/PreferencesActivity.java |  4 ++++
 src/main/res/values/dimens.xml                       |  7 -------
 4 files changed, 20 insertions(+), 12 deletions(-)
 delete mode 100644 src/main/res/values/dimens.xml

diff --git a/build.gradle b/build.gradle
index 91aed46..acd5d7e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,14 +20,21 @@ repositories {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:18.0.+'
-    compile 'com.android.support:mediarouter-v7:18.0.+'
+    compile 'com.android.support:appcompat-v7:19.1.+'
+    compile 'com.android.support:mediarouter-v7:19.1.+'
     compile 'org.teleal.cling:cling-core:1.0.5+'
     compile 'org.teleal.cling:cling-support:1.0.5+'
 }
+
 android {
     compileSdkVersion 19
     buildToolsVersion "19.0.3"
+
+	// Caused by cling, because they apparently include APIs for other platforms.
+	lintOptions {
+		disable 'InvalidPackage'
+	}
+
     signingConfigs {
         release {
             // Android Studio does not pass environment variables.
@@ -50,4 +57,5 @@ android {
             signingConfig signingConfigs.release
         }
     }
+
 }
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b601219..99ea882 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+		  xmlns:tools="http://schemas.android.com/tools"
 		package="com.github.nutomic.controldlna"
 		android:versionCode="14"
-		android:versionName="1.0.2" >
+		android:versionName="1.0.2"
+		tools:ignore="ExportedService" >
 
 	<uses-permission android:name="android.permission.INTERNET"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
@@ -54,14 +56,15 @@
 
 		<service android:name=".upnp.ProviderService"
 				android:label="@string/upnp_route_provider_service"
-				android:process=":mrp">
+				android:process=":mrp" >
 			<intent-filter>
 				<action android:name="android.media.MediaRouteProviderService" />
 			</intent-filter>
 		</service>
 
 		<service android:name=".localroute.ProviderService"
-				android:process=":mrp">
+				android:label="@string/local_device"
+				android:process=":mrp" >
 			<intent-filter>
 				<action android:name="android.media.MediaRouteProviderService" />
 			</intent-filter>
diff --git a/src/main/java/com/github/nutomic/controldlna/gui/PreferencesActivity.java b/src/main/java/com/github/nutomic/controldlna/gui/PreferencesActivity.java
index 937e922..1ae3afe 100644
--- a/src/main/java/com/github/nutomic/controldlna/gui/PreferencesActivity.java
+++ b/src/main/java/com/github/nutomic/controldlna/gui/PreferencesActivity.java
@@ -27,6 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 package com.github.nutomic.controldlna.gui;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
@@ -54,8 +55,11 @@ public class PreferencesActivity extends PreferenceActivity
 
 	/**
 	 * Initializes preferences from xml.
+	 *
+	 * Manual target API as we manually check if ActionBar is available (for ActionBar back button).
 	 */
 	@Override
+	@TargetApi(11)
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
deleted file mode 100644
index 3c6cff8..0000000
--- a/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-
-	<!-- Default screen margins, per the Android Design guidelines. -->
-	<dimen name="activity_horizontal_margin">16dp</dimen>
-	<dimen name="activity_vertical_margin">16dp</dimen>
-
-</resources>