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

This commit is contained in:
Adrian Ulrich committed 2012-09-23 14:28:57 +02:00
1 parent ea2eb070a9
commit b0c0044026
49 files changed
+69 -69

No files matched your search

+6 -6
View File
@@ -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
+2 -2
View File
@@ -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
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.SharedPreferences;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.util.AttributeSet;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.media.MediaPlayer;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.app.backup.BackupManager;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.app.ActionBar;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.app.PendingIntent;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.media.MediaMetadataRetriever;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.content.res.Resources;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.graphics.Bitmap;
@@ -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;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.graphics.Canvas;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.content.Intent;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -21,7 +21,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.AlertDialog.Builder;
import android.content.Context;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.AlertDialog;
import android.content.ContentResolver;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Intent;
import android.view.View;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import java.io.Serializable;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.preference.ListPreference;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.content.Intent;
@@ -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);
}
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.ContentResolver;
import android.database.Cursor;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Intent;
import android.os.Bundle;
@@ -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;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.Dialog;
import android.content.ContentResolver;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.Activity;
import android.content.Intent;
@@ -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;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.Activity;
import android.app.AlertDialog;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.ContentResolver;
import android.content.ContentUris;
@@ -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.
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.app.Activity;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.annotation.TargetApi;
import android.app.backup.BackupAgentHelper;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.ContentResolver;
import android.database.Cursor;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.content.res.TypedArray;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.ContentResolver;
import android.content.Context;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.ContentResolver;
import android.content.Context;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.Activity;
import android.content.SharedPreferences;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.content.Context;
import android.view.LayoutInflater;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
package org.kreed.vanilla;
package ch.blinkenlights.android.vanilla;
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
@@ -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