From 0ede5aa4d154ef55b7f63f0fdb91763ce1638e8f Mon Sep 17 00:00:00 2001
From: Adrian Ulrich <adrian@blinkenlights.ch>
Date: Tue, 14 Oct 2014 10:23:58 +0200
Subject: [PATCH] get rid of some legacy stuff

---
 src/ch/blinkenlights/android/vanilla/PlaybackService.java | 4 ++--
 .../android/vanilla/PreferencesActivity.java              | 1 -
 .../vanilla/{CompatIcs.java => RemoteControl.java}        | 8 ++------
 3 files changed, 4 insertions(+), 9 deletions(-)
 rename src/ch/blinkenlights/android/vanilla/{CompatIcs.java => RemoteControl.java} (96%)

diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackService.java b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
index 6353a298..24ca49c2 100644
--- a/src/ch/blinkenlights/android/vanilla/PlaybackService.java
+++ b/src/ch/blinkenlights/android/vanilla/PlaybackService.java
@@ -444,7 +444,7 @@ public final class PlaybackService extends Service
 
 		getContentResolver().registerContentObserver(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, true, mObserver);
 
-		CompatIcs.registerRemote(this, mAudioManager);
+		RemoteControl.registerRemote(this, mAudioManager);
 
 		mLooper = thread.getLooper();
 		mHandler = new Handler(mLooper, this);
@@ -953,7 +953,7 @@ public final class PlaybackService extends Service
 
 		updateWidgets();
 
-		CompatIcs.updateRemote(this, mCurrentSong, mState);
+		RemoteControl.updateRemote(this, mCurrentSong, mState);
 
 		if (mStockBroadcast)
 			stockMusicBroadcast();
diff --git a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
index e3e26b27..123ed72f 100644
--- a/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
+++ b/src/ch/blinkenlights/android/vanilla/PreferencesActivity.java
@@ -23,7 +23,6 @@
 
 package ch.blinkenlights.android.vanilla;
 
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.graphics.Color;
 import android.os.Build;
diff --git a/src/ch/blinkenlights/android/vanilla/CompatIcs.java b/src/ch/blinkenlights/android/vanilla/RemoteControl.java
similarity index 96%
rename from src/ch/blinkenlights/android/vanilla/CompatIcs.java
rename to src/ch/blinkenlights/android/vanilla/RemoteControl.java
index 781fd18e..68594be1 100644
--- a/src/ch/blinkenlights/android/vanilla/CompatIcs.java
+++ b/src/ch/blinkenlights/android/vanilla/RemoteControl.java
@@ -22,7 +22,6 @@
 
 package ch.blinkenlights.android.vanilla;
 
-import android.annotation.TargetApi;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
@@ -32,11 +31,8 @@ import android.media.AudioManager;
 import android.media.MediaMetadataRetriever;
 import android.media.RemoteControlClient;
 
-/**
- * Framework methods only in ICS or above go here.
- */
-@TargetApi(14)
-public class CompatIcs {
+
+public class RemoteControl {
 	/**
 	 * Used with updateRemote method.
 	 */