rename package name in order to avoid name clashes with 'old' version

AndroidManifest.xml

@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.kreed.vanilla"
+	package="ch.blinkenlights.android.vanilla"
 	android:versionName="0.9.10"
 	android:versionCode="0910"
 	android:installLocation="auto">
@@ -126,11 +126,11 @@ THE SOFTWARE.
 		</receiver>
 		<service android:name="PlaybackService">
 			<intent-filter>
-				<action android:name="org.kreed.vanilla.action.PLAY" />
-				<action android:name="org.kreed.vanilla.action.PAUSE" />
-				<action android:name="org.kreed.vanilla.action.TOGGLE_PLAYBACK" />
-				<action android:name="org.kreed.vanilla.action.NEXT_SONG" />
-				<action android:name="org.kreed.vanilla.action.PREVIOUS_SONG" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.PLAY" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.PAUSE" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.NEXT_SONG" />
+				<action android:name="ch.blinkenlights.android.vanilla.action.PREVIOUS_SONG" />
 			</intent-filter>
 		</service>
 		<activity

src/android/support/v4/view/ViewPager.java

@@ -45,8 +45,8 @@ import android.widget.Scroller;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import org.kreed.vanilla.CompatFroyo;
-import org.kreed.vanilla.CompatHoneycomb;
+import ch.blinkenlights.android.vanilla.CompatFroyo;
+import ch.blinkenlights.android.vanilla.CompatHoneycomb;
 
 /**
  * Layout manager that allows the user to flip left and right

src/ch/blinkenlights/android/vanilla/Action.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.SharedPreferences;
 

src/ch/blinkenlights/android/vanilla/ActionBarControls.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.util.AttributeSet;

src/ch/blinkenlights/android/vanilla/CompatEq.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.media.MediaPlayer;

src/ch/blinkenlights/android/vanilla/CompatFroyo.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.backup.BackupManager;

src/ch/blinkenlights/android/vanilla/CompatHoneycomb.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.ActionBar;

src/ch/blinkenlights/android/vanilla/CompatIcs.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.PendingIntent;

src/ch/blinkenlights/android/vanilla/CompatMetadata.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.media.MediaMetadataRetriever;

src/ch/blinkenlights/android/vanilla/CoverBitmap.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.res.Resources;

src/ch/blinkenlights/android/vanilla/CoverView.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/ch/blinkenlights/android/vanilla/DragListView.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.graphics.Bitmap;

src/ch/blinkenlights/android/vanilla/DragTextView.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.graphics.Canvas;

src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.Intent;

src/ch/blinkenlights/android/vanilla/FourLongWidget.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;

src/ch/blinkenlights/android/vanilla/FourSquareWidget.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;

src/ch/blinkenlights/android/vanilla/FourWhiteWidget.java

@@ -21,7 +21,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;

src/ch/blinkenlights/android/vanilla/FullPlaybackActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.content.SharedPreferences;

src/ch/blinkenlights/android/vanilla/IdlePreference.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.AlertDialog.Builder;
 import android.content.Context;

src/ch/blinkenlights/android/vanilla/LibraryActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.AlertDialog;
 import android.content.ContentResolver;

src/ch/blinkenlights/android/vanilla/LibraryAdapter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.view.View;

src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.content.SharedPreferences;

src/ch/blinkenlights/android/vanilla/Limiter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import java.io.Serializable;
 

src/ch/blinkenlights/android/vanilla/ListPreferenceSummary.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.preference.ListPreference;

src/ch/blinkenlights/android/vanilla/MediaAdapter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.Intent;

src/ch/blinkenlights/android/vanilla/MediaButtonReceiver.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -87,7 +87,7 @@ public class MediaButtonReceiver extends BroadcastReceiver {
 		if (sBeep == 1) {
 			if (sBeepPlayer == null) {
 				sBeepPlayer = new AsyncPlayer("BeepPlayer");
-				sBeepSound = Uri.parse("android.resource://org.kreed.vanilla/raw/beep");
+				sBeepSound = Uri.parse("android.resource://ch.blinkenlights.android.vanilla/raw/beep");
 			}
 			sBeepPlayer.play(context, sBeepSound, false, AudioManager.STREAM_MUSIC);
 		}

src/ch/blinkenlights/android/vanilla/MediaUtils.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.database.Cursor;

src/ch/blinkenlights/android/vanilla/MiniPlaybackActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Intent;
 import android.os.Bundle;

src/ch/blinkenlights/android/vanilla/MusicAlphabetIndexer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.database.Cursor;
 import android.provider.MediaStore;

src/ch/blinkenlights/android/vanilla/NewPlaylistDialog.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Dialog;
 import android.content.ContentResolver;

src/ch/blinkenlights/android/vanilla/OneCellWidget.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;

src/ch/blinkenlights/android/vanilla/PlaybackActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Activity;
 import android.content.Intent;

src/ch/blinkenlights/android/vanilla/PlaybackService.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Notification;
 import android.app.NotificationManager;
@@ -96,15 +96,15 @@ public final class PlaybackService extends Service
 	/**
 	 * Action for startService: toggle playback on/off.
 	 */
-	public static final String ACTION_TOGGLE_PLAYBACK = "org.kreed.vanilla.action.TOGGLE_PLAYBACK";
+	public static final String ACTION_TOGGLE_PLAYBACK = "ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK";
 	/**
 	 * Action for startService: start playback if paused.
 	 */
-	public static final String ACTION_PLAY = "org.kreed.vanilla.action.PLAY";
+	public static final String ACTION_PLAY = "ch.blinkenlights.android.vanilla.action.PLAY";
 	/**
 	 * Action for startService: pause playback if playing.
 	 */
-	public static final String ACTION_PAUSE = "org.kreed.vanilla.action.PAUSE";
+	public static final String ACTION_PAUSE = "ch.blinkenlights.android.vanilla.action.PAUSE";
 	/**
 	 * Action for startService: toggle playback on/off.
 	 *
@@ -113,18 +113,18 @@ public final class PlaybackService extends Service
 	 * actions are received within 400 ms, the playback activity is opened
 	 * instead.
 	 */
-	public static final String ACTION_TOGGLE_PLAYBACK_DELAYED = "org.kreed.vanilla.action.TOGGLE_PLAYBACK_DELAYED";
+	public static final String ACTION_TOGGLE_PLAYBACK_DELAYED = "ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK_DELAYED";
 	/**
 	 * Action for startService: toggle playback on/off.
 	 *
 	 * This works the same way as ACTION_PLAY_PAUSE but prevents the notification
 	 * from being hidden regardless of notification visibility settings.
 	 */
-	public static final String ACTION_TOGGLE_PLAYBACK_NOTIFICATION = "org.kreed.vanilla.action.TOGGLE_PLAYBACK_NOTIFICATION";
+	public static final String ACTION_TOGGLE_PLAYBACK_NOTIFICATION = "ch.blinkenlights.android.vanilla.action.TOGGLE_PLAYBACK_NOTIFICATION";
 	/**
 	 * Action for startService: advance to the next song.
 	 */
-	public static final String ACTION_NEXT_SONG = "org.kreed.vanilla.action.NEXT_SONG";
+	public static final String ACTION_NEXT_SONG = "ch.blinkenlights.android.vanilla.action.NEXT_SONG";
 	/**
 	 * Action for startService: advance to the next song.
 	 *
@@ -133,37 +133,37 @@ public final class PlaybackService extends Service
 	 * actions are received within 400 ms, the playback activity is opened
 	 * instead.
 	 */
-	public static final String ACTION_NEXT_SONG_DELAYED = "org.kreed.vanilla.action.NEXT_SONG_DELAYED";
+	public static final String ACTION_NEXT_SONG_DELAYED = "ch.blinkenlights.android.vanilla.action.NEXT_SONG_DELAYED";
 	/**
 	 * Action for startService: advance to the next song.
 	 *
 	 * Like ACTION_NEXT_SONG, but starts playing automatically if paused
 	 * when this is called.
 	 */
-	public static final String ACTION_NEXT_SONG_AUTOPLAY = "org.kreed.vanilla.action.NEXT_SONG_AUTOPLAY";
+	public static final String ACTION_NEXT_SONG_AUTOPLAY = "ch.blinkenlights.android.vanilla.action.NEXT_SONG_AUTOPLAY";
 	/**
 	 * Action for startService: go back to the previous song.
 	 */
-	public static final String ACTION_PREVIOUS_SONG = "org.kreed.vanilla.action.PREVIOUS_SONG";
+	public static final String ACTION_PREVIOUS_SONG = "ch.blinkenlights.android.vanilla.action.PREVIOUS_SONG";
 	/**
 	 * Action for startService: go back to the previous song.
 	 *
 	 * Like ACTION_PREVIOUS_SONG, but starts playing automatically if paused
 	 * when this is called.
 	 */
-	public static final String ACTION_PREVIOUS_SONG_AUTOPLAY = "org.kreed.vanilla.action.PREVIOUS_SONG_AUTOPLAY";
+	public static final String ACTION_PREVIOUS_SONG_AUTOPLAY = "ch.blinkenlights.android.vanilla.action.PREVIOUS_SONG_AUTOPLAY";
 	/**
 	 * Change the shuffle mode.
 	 */
-	public static final String ACTION_CYCLE_SHUFFLE = "org.kreed.vanilla.CYCLE_SHUFFLE";
+	public static final String ACTION_CYCLE_SHUFFLE = "ch.blinkenlights.android.vanilla.CYCLE_SHUFFLE";
 	/**
 	 * Change the repeat mode.
 	 */
-	public static final String ACTION_CYCLE_REPEAT = "org.kreed.vanilla.CYCLE_REPEAT";
+	public static final String ACTION_CYCLE_REPEAT = "ch.blinkenlights.android.vanilla.CYCLE_REPEAT";
 	/**
 	 * Pause music and hide the notifcation.
 	 */
-	public static final String ACTION_CLOSE_NOTIFICATION = "org.kreed.vanilla.CLOSE_NOTIFICATION";
+	public static final String ACTION_CLOSE_NOTIFICATION = "ch.blinkenlights.android.vanilla.CLOSE_NOTIFICATION";
 
 	public static final int NEVER = 0;
 	public static final int WHEN_PLAYING = 1;

src/ch/blinkenlights/android/vanilla/Playlist.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;

src/ch/blinkenlights/android/vanilla/PlaylistActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Activity;
 import android.app.AlertDialog;

src/ch/blinkenlights/android/vanilla/PlaylistAdapter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.ContentUris;

src/ch/blinkenlights/android/vanilla/PrefKeys.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 /**
  * SharedPreference keys. Must be kept in sync with keys in res/xml/prefs_*.xml.

src/ch/blinkenlights/android/vanilla/PreferencesActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.Activity;

src/ch/blinkenlights/android/vanilla/PreferencesBackupAgent.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.annotation.TargetApi;
 import android.app.backup.BackupAgentHelper;

src/ch/blinkenlights/android/vanilla/QueryTask.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.database.Cursor;

src/ch/blinkenlights/android/vanilla/ScanPreference.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/ch/blinkenlights/android/vanilla/SeekBarPreference.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.content.res.TypedArray;

src/ch/blinkenlights/android/vanilla/Song.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.Context;

src/ch/blinkenlights/android/vanilla/SongTimeline.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.ContentResolver;
 import android.content.Context;

src/ch/blinkenlights/android/vanilla/TabOrderActivity.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.Activity;
 import android.content.SharedPreferences;

src/ch/blinkenlights/android/vanilla/TabOrderAdapter.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.content.Context;
 import android.view.LayoutInflater;

src/ch/blinkenlights/android/vanilla/WidgetD.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;

src/ch/blinkenlights/android/vanilla/WidgetE.java

@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-package org.kreed.vanilla;
+package ch.blinkenlights.android.vanilla;
 
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetManager;

src/com/viewpagerindicator/TabPageIndicator.java

@@ -30,7 +30,7 @@ import android.view.ViewGroup;
 import android.widget.HorizontalScrollView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import org.kreed.vanilla.R;
+import ch.blinkenlights.android.vanilla.R;
 
 /**
  * This widget implements the dynamic action bar tab behavior that can change