Automated import from //branches/donutburger/...@140648,140648

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0606ecf..533eb05 100644 (file)
--- 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/ic_launcher_shortcut_music_playlist.png b/res/drawable/ic_launcher_shortcut_music_playlist.png
new file mode 100644 (file)
index 0000000..352a4d7
Binary files /dev/null and b/res/drawable/ic_launcher_shortcut_music_playlist.png differ

diff --git a/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index aa0525e..da934b2 100644 (file)
--- a/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
@@ -346,7 +346,7 @@ public class PlaylistBrowserActivity extends ListActivity
             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();