Copy fast scroll alphabet and other resources in to the music app.

diff --git a/res/drawable-hdpi/ic_menu_clear_playlist.png b/res/drawable-hdpi/ic_menu_clear_playlist.png
new file mode 100644 (file)
index 0000000..e6be48b
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_clear_playlist.png differ

diff --git a/res/drawable-hdpi/ic_menu_play_clip.png b/res/drawable-hdpi/ic_menu_play_clip.png
new file mode 100644 (file)
index 0000000..ddde03a
Binary files /dev/null and b/res/drawable-hdpi/ic_menu_play_clip.png differ

diff --git a/res/drawable-mdpi/ic_menu_clear_playlist.png b/res/drawable-mdpi/ic_menu_clear_playlist.png
new file mode 100644 (file)
index 0000000..750db62
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_clear_playlist.png differ

diff --git a/res/drawable-mdpi/ic_menu_play_clip.png b/res/drawable-mdpi/ic_menu_play_clip.png
new file mode 100644 (file)
index 0000000..4669947
Binary files /dev/null and b/res/drawable-mdpi/ic_menu_play_clip.png differ

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 75f2496..a8fb01e 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -38,7 +38,7 @@
         <!-- number of albums is not equal to one -->
         <item quantity="other"><xliff:g id="count">%d</xliff:g> albums</item>
     </plurals>
-    
+
     <!--
     This string is used as the format string in a String.format call,
     and 5 additional arguments are available for printing:
@@ -267,7 +267,7 @@
     <string name="working_songs">Songs\u2026</string>
     <!-- Shown in the title bar while the list of playlists is being retrieved in the background -->
     <string name="working_playlists">Playlists\u2026</string>
-    
+
     <!-- Shown in the music picker while loading the music database. -->
     <string name="loading">Loading</string>
     <!-- Menu in music picker to sort the list by track/song name. -->
@@ -284,8 +284,11 @@
 
     <!-- Toast after streamStarter activity receives PLAYBACK_COMPLETE in case of an error -->
     <string name="fail_to_start_stream">Failed to play the requested stream.</string>
-    
+
     <!-- The string used to describe Music as a searchable item within system search settings. -->
     <string name="search_settings_description">Artists, albums, and tracks</string>
+
+    <!--The fast scroll thumb will show one character from this string depending on the position in the list -->
+    <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
 </resources>
 

diff --git a/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index 5870486..d73cbcc 100644 (file)
--- a/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@ -565,7 +565,7 @@ public class AlbumBrowserActivity extends ListActivity
                     mIndexer.setCursor(cursor);
                 } else {
                     mIndexer = new MusicAlphabetIndexer(cursor, mAlbumIdx, mResources.getString(
-                            com.android.internal.R.string.fast_scroll_alphabet));
+                            R.string.fast_scroll_alphabet));
                 }
             }
         }

diff --git a/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index 139fcc7..359c464 100644 (file)
--- a/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@ -618,7 +618,7 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity
                     mIndexer.setCursor(cursor);
                 } else {
                     mIndexer = new MusicAlphabetIndexer(cursor, mGroupArtistIdx, 
-                            mResources.getString(com.android.internal.R.string.fast_scroll_alphabet));
+                            mResources.getString(R.string.fast_scroll_alphabet));
                 }
             }
         }

diff --git a/src/com/android/music/MusicBrowserActivity.java b/src/com/android/music/MusicBrowserActivity.java
index 3554234..d82cdff 100644 (file)
--- a/src/com/android/music/MusicBrowserActivity.java
+++ b/src/com/android/music/MusicBrowserActivity.java
@@ -17,30 +17,12 @@
 package com.android.music;
 
 import android.app.Activity;
-import android.app.SearchManager;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
-import android.media.MediaFile;
-import android.net.Uri;
 import android.os.Bundle;
-import android.os.RemoteException;
 import android.os.IBinder;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.Window;
-import android.widget.ImageButton;
-import android.widget.TextView;
+import android.os.RemoteException;
 
 public class MusicBrowserActivity extends Activity
     implements MusicUtils.Defs {

diff --git a/src/com/android/music/MusicPicker.java b/src/com/android/music/MusicPicker.java
index 103ee0b..13919ad 100644 (file)
--- a/src/com/android/music/MusicPicker.java
+++ b/src/com/android/music/MusicPicker.java
@@ -319,8 +319,7 @@ public class MusicPicker extends ListActivity
                             break;
                     }
                     mIndexer = new MusicAlphabetIndexer(cursor, idx,
-                            getResources().getString(
-                                    com.android.internal.R.string.fast_scroll_alphabet));
+                            getResources().getString(R.string.fast_scroll_alphabet));
                     
                 // If we have a valid indexer, but the cursor has changed since
                 // its last use, then point it to the current cursor.

diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 41704d5..c0b19ef 100644 (file)
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -883,14 +883,14 @@ public class TrackBrowserActivity extends ListActivity
          */
         super.onCreateOptionsMenu(menu);
         if (mPlaylist == null) {
-            menu.add(0, PLAY_ALL, 0, R.string.play_all).setIcon(com.android.internal.R.drawable.ic_menu_play_clip);
+            menu.add(0, PLAY_ALL, 0, R.string.play_all).setIcon(R.drawable.ic_menu_play_clip);
         }
         menu.add(0, PARTY_SHUFFLE, 0, R.string.party_shuffle); // icon will be set in onPrepareOptionsMenu()
         menu.add(0, SHUFFLE_ALL, 0, R.string.shuffle_all).setIcon(R.drawable.ic_menu_shuffle);
         if (mPlaylist != null) {
             menu.add(0, SAVE_AS_PLAYLIST, 0, R.string.save_as_playlist).setIcon(android.R.drawable.ic_menu_save);
             if (mPlaylist.equals("nowplaying")) {
-                menu.add(0, CLEAR_PLAYLIST, 0, R.string.clear_playlist).setIcon(com.android.internal.R.drawable.ic_menu_clear_playlist);
+                menu.add(0, CLEAR_PLAYLIST, 0, R.string.clear_playlist).setIcon(R.drawable.ic_menu_clear_playlist);
             }
         }
         return true;
@@ -1404,8 +1404,7 @@ public class TrackBrowserActivity extends ListActivity
                 if (mIndexer != null) {
                     mIndexer.setCursor(cursor);
                 } else if (!mActivity.mEditMode) {
-                    String alpha = mActivity.getString(
-                            com.android.internal.R.string.fast_scroll_alphabet);
+                    String alpha = mActivity.getString(R.string.fast_scroll_alphabet);
                 
                     mIndexer = new MusicAlphabetIndexer(cursor, mTitleIdx, alpha);
                 }