auto import from //branches/cupcake_rel/...@141571
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0606ecf..533eb05 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -143,7 +143,8 @@
</activity>
<activity-alias android:name="PlaylistShortcutActivity"
android:targetActivity="PlaylistBrowserActivity"
- android:label="@string/musicshortcutlabel">
+ android:label="@string/musicshortcutlabel"
+ android:icon="@drawable/ic_launcher_shortcut_music_playlist">
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
diff --git a/res/drawable-finger/appwidget_next.xml b/res/drawable-finger/appwidget_next.xml
index 5cedb82..ec2b8d6 100644
--- a/res/drawable-finger/appwidget_next.xml
+++ b/res/drawable-finger/appwidget_next.xml
@@ -20,7 +20,7 @@
<item android:state_pressed="true"
android:drawable="@drawable/appwidget_next_pressed" />
<item android:state_focused="true"
- android:drawable="@drawable/appwidget_next_pressed" />
+ android:drawable="@drawable/appwidget_next_focused" />
<item
android:drawable="@drawable/appwidget_next_normal" />
</selector>
diff --git a/res/drawable-finger/appwidget_next_focused.png b/res/drawable-finger/appwidget_next_focused.png
new file mode 100644
index 0000000..90548f7
--- /dev/null
+++ b/res/drawable-finger/appwidget_next_focused.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_next_pressed.png b/res/drawable-finger/appwidget_next_pressed.png
index e8ae5d9..0b6dd31 100644
--- a/res/drawable-finger/appwidget_next_pressed.png
+++ b/res/drawable-finger/appwidget_next_pressed.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_pause.xml b/res/drawable-finger/appwidget_pause.xml
index 071f0c2..bdd1c2d 100644
--- a/res/drawable-finger/appwidget_pause.xml
+++ b/res/drawable-finger/appwidget_pause.xml
@@ -20,7 +20,7 @@
<item android:state_pressed="true"
android:drawable="@drawable/appwidget_pause_pressed" />
<item android:state_focused="true"
- android:drawable="@drawable/appwidget_pause_pressed" />
+ android:drawable="@drawable/appwidget_pause_focused" />
<item
android:drawable="@drawable/appwidget_pause_normal" />
</selector>
diff --git a/res/drawable-finger/appwidget_pause_focused.png b/res/drawable-finger/appwidget_pause_focused.png
new file mode 100644
index 0000000..920e16d
--- /dev/null
+++ b/res/drawable-finger/appwidget_pause_focused.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_pause_pressed.png b/res/drawable-finger/appwidget_pause_pressed.png
index 2a5116c..03ad69b 100644
--- a/res/drawable-finger/appwidget_pause_pressed.png
+++ b/res/drawable-finger/appwidget_pause_pressed.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_play.xml b/res/drawable-finger/appwidget_play.xml
index 9f9e432..0e09d34 100644
--- a/res/drawable-finger/appwidget_play.xml
+++ b/res/drawable-finger/appwidget_play.xml
@@ -20,7 +20,7 @@
<item android:state_pressed="true"
android:drawable="@drawable/appwidget_play_pressed" />
<item android:state_focused="true"
- android:drawable="@drawable/appwidget_play_pressed" />
+ android:drawable="@drawable/appwidget_play_focused" />
<item
android:drawable="@drawable/appwidget_play_normal" />
</selector>
diff --git a/res/drawable-finger/appwidget_play_focused.png b/res/drawable-finger/appwidget_play_focused.png
new file mode 100644
index 0000000..5d9bc3a
--- /dev/null
+++ b/res/drawable-finger/appwidget_play_focused.png
Binary files differ
diff --git a/res/drawable-finger/appwidget_play_pressed.png b/res/drawable-finger/appwidget_play_pressed.png
index 747b5ae..02dbeca 100644
--- a/res/drawable-finger/appwidget_play_pressed.png
+++ b/res/drawable-finger/appwidget_play_pressed.png
Binary files differ
diff --git a/res/drawable/ic_launcher_shortcut_music_playlist.png b/res/drawable/ic_launcher_shortcut_music_playlist.png
new file mode 100644
index 0000000..352a4d7
--- /dev/null
+++ b/res/drawable/ic_launcher_shortcut_music_playlist.png
Binary files differ
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4c6eecf..6b0bc1a 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -115,12 +115,12 @@
<string name="weekpicker_set">"完了"</string>
<string name="weekpicker_title">"期間の設定"</string>
<string name="save_as_playlist">"プレイリストとして保存"</string>
- <string name="clear_playlist">"プレイリストをクリア"</string>
- <string name="musicbrowserlabel">"ミュージック"</string>
+ <string name="clear_playlist">"プレイリストを消去"</string>
+ <string name="musicbrowserlabel">"音楽"</string>
<string name="musicshortcutlabel">"ミュージックプレイリスト"</string>
- <string name="mediaplaybacklabel">"ミュージック"</string>
+ <string name="mediaplaybacklabel">"音楽"</string>
<string name="videobrowserlabel">"動画"</string>
- <string name="mediapickerlabel">"ミュージック"</string>
+ <string name="mediapickerlabel">"音楽"</string>
<string name="playback_failed">"プレーヤーが対応していない音声ファイル形式です。"</string>
<string name="cancel">"キャンセル"</string>
<string name="remove_from_playlist">"プレイリストから削除"</string>
diff --git a/src/com/android/music/MediaAppWidgetProvider.java b/src/com/android/music/MediaAppWidgetProvider.java
index 008f460..e7b1e3e 100644
--- a/src/com/android/music/MediaAppWidgetProvider.java
+++ b/src/com/android/music/MediaAppWidgetProvider.java
@@ -19,24 +19,11 @@
import android.app.PendingIntent;
import android.appwidget.AppWidgetManager;
import android.appwidget.AppWidgetProvider;
-import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Rect;
-import android.media.MediaFile;
import android.os.Environment;
-import android.os.SystemClock;
-import android.util.Config;
-import android.util.Log;
-import android.view.View;
import android.widget.RemoteViews;
/**
diff --git a/src/com/android/music/MediaPlaybackService.java b/src/com/android/music/MediaPlaybackService.java
index 8c1c9db..deedf27 100644
--- a/src/com/android/music/MediaPlaybackService.java
+++ b/src/com/android/music/MediaPlaybackService.java
@@ -760,6 +760,7 @@
if (mShuffleMode == SHUFFLE_AUTO) {
mShuffleMode = SHUFFLE_NORMAL;
}
+ int oldId = getAudioId();
int listlength = list.length;
boolean newlist = true;
if (mPlayListLen == listlength) {
@@ -786,8 +787,7 @@
saveBookmarkIfNeeded();
openCurrent();
- if (!newlist && mPlayPos != oldpos) {
- // the queue didn't change, but the position did
+ if (oldId != getAudioId()) {
notifyChange(META_CHANGED);
}
}
diff --git a/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index aa0525e..da934b2 100644
--- a/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
@@ -346,7 +346,7 @@
intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcut);
intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, ((TextView) v.findViewById(R.id.line1)).getText());
intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(
- this, R.drawable.app_music));
+ this, R.drawable.ic_launcher_shortcut_music_playlist));
setResult(RESULT_OK, intent);
finish();
