Refer to USB storage instead of SD card on devices without removable storage.
Change-Id: I934f44ca79339779f2d531c05439960602174c1d
diff --git a/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index 4143bed..69d6185 100644
--- a/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@ -326,7 +326,12 @@
}
case DELETE_ITEM: {
long [] list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
- String f = getString(R.string.delete_album_desc);
+ String f;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ f = getString(R.string.delete_album_desc);
+ } else {
+ f = getString(R.string.delete_album_desc_nosdcard);
+ }
String desc = String.format(f, mCurrentAlbumName);
Bundle b = new Bundle();
b.putString("description", desc);
diff --git a/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index a2fea62..e0068be 100644
--- a/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@ -425,11 +425,22 @@
String desc;
if (mCurrentArtistId != null) {
list = MusicUtils.getSongListForArtist(this, Long.parseLong(mCurrentArtistId));
- String f = getString(R.string.delete_artist_desc);
+ String f;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ f = getString(R.string.delete_artist_desc);
+ } else {
+ f = getString(R.string.delete_artist_desc_nosdcard);
+ }
desc = String.format(f, mCurrentArtistName);
} else {
list = MusicUtils.getSongListForAlbum(this, Long.parseLong(mCurrentAlbumId));
- String f = getString(R.string.delete_album_desc);
+ String f;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ f = getString(R.string.delete_album_desc);
+ } else {
+ f = getString(R.string.delete_album_desc_nosdcard);
+ }
+
desc = String.format(f, mCurrentAlbumName);
}
Bundle b = new Bundle();
diff --git a/src/com/android/music/MediaAppWidgetProvider.java b/src/com/android/music/MediaAppWidgetProvider.java
index 01956ae..159aace 100644
--- a/src/com/android/music/MediaAppWidgetProvider.java
+++ b/src/com/android/music/MediaAppWidgetProvider.java
@@ -122,9 +122,17 @@
String status = Environment.getExternalStorageState();
if (status.equals(Environment.MEDIA_SHARED) ||
status.equals(Environment.MEDIA_UNMOUNTED)) {
- errorState = res.getText(R.string.sdcard_busy_title);
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ errorState = res.getText(R.string.sdcard_busy_title);
+ } else {
+ errorState = res.getText(R.string.sdcard_busy_title_nosdcard);
+ }
} else if (status.equals(Environment.MEDIA_REMOVED)) {
- errorState = res.getText(R.string.sdcard_missing_title);
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ errorState = res.getText(R.string.sdcard_missing_title);
+ } else {
+ errorState = res.getText(R.string.sdcard_missing_title_nosdcard);
+ }
} else if (titleName == null) {
errorState = res.getText(R.string.emptyplaylist);
}
diff --git a/src/com/android/music/MediaPlaybackActivity.java b/src/com/android/music/MediaPlaybackActivity.java
index 0f1685b..8e1d6a0 100644
--- a/src/com/android/music/MediaPlaybackActivity.java
+++ b/src/com/android/music/MediaPlaybackActivity.java
@@ -609,8 +609,13 @@
long [] list = new long[1];
list[0] = MusicUtils.getCurrentAudioId();
Bundle b = new Bundle();
- b.putString("description", getString(R.string.delete_song_desc,
- mService.getTrackName()));
+ String f;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ f = getString(R.string.delete_song_desc, mService.getTrackName());
+ } else {
+ f = getString(R.string.delete_song_desc_nosdcard, mService.getTrackName());
+ }
+ b.putString("description", f);
b.putLongArray("items", list);
intent = new Intent();
intent.setClass(this, DeleteItems.class);
diff --git a/src/com/android/music/MusicUtils.java b/src/com/android/music/MusicUtils.java
index b770557..d14e98e 100644
--- a/src/com/android/music/MusicUtils.java
+++ b/src/com/android/music/MusicUtils.java
@@ -656,16 +656,33 @@
}
String status = Environment.getExternalStorageState();
- int title = R.string.sdcard_error_title;
- int message = R.string.sdcard_error_message;
+ int title, message;
+
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ title = R.string.sdcard_error_title;
+ message = R.string.sdcard_error_message;
+ } else {
+ title = R.string.sdcard_error_title_nosdcard;
+ message = R.string.sdcard_error_message_nosdcard;
+ }
if (status.equals(Environment.MEDIA_SHARED) ||
status.equals(Environment.MEDIA_UNMOUNTED)) {
- title = R.string.sdcard_busy_title;
- message = R.string.sdcard_busy_message;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ title = R.string.sdcard_busy_title;
+ message = R.string.sdcard_busy_message;
+ } else {
+ title = R.string.sdcard_busy_title_nosdcard;
+ message = R.string.sdcard_busy_message_nosdcard;
+ }
} else if (status.equals(Environment.MEDIA_REMOVED)) {
- title = R.string.sdcard_missing_title;
- message = R.string.sdcard_missing_message;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ title = R.string.sdcard_missing_title;
+ message = R.string.sdcard_missing_message;
+ } else {
+ title = R.string.sdcard_missing_title_nosdcard;
+ message = R.string.sdcard_missing_message_nosdcard;
+ }
} else if (status.equals(Environment.MEDIA_MOUNTED)){
// The card is mounted, but we didn't get a valid cursor.
// This probably means the mediascanner hasn't started scanning the
diff --git a/src/com/android/music/ScanningProgress.java b/src/com/android/music/ScanningProgress.java
index e5eae94..3d5f926 100644
--- a/src/com/android/music/ScanningProgress.java
+++ b/src/com/android/music/ScanningProgress.java
@@ -65,7 +65,11 @@
setVolumeControlStream(AudioManager.STREAM_MUSIC);
requestWindowFeature(Window.FEATURE_NO_TITLE);
- setContentView(R.layout.scanning);
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ setContentView(R.layout.scanning);
+ } else {
+ setContentView(R.layout.scanning_nosdcard);
+ }
getWindow().setLayout(WindowManager.LayoutParams.WRAP_CONTENT,
WindowManager.LayoutParams.WRAP_CONTENT);
setResult(RESULT_CANCELED);
diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 20e3060..6f9129b 100644
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -712,7 +712,12 @@
long [] list = new long[1];
list[0] = (int) mSelectedId;
Bundle b = new Bundle();
- String f = getString(R.string.delete_song_desc);
+ String f;
+ if (android.os.Environment.isExternalStorageRemovable()) {
+ f = getString(R.string.delete_song_desc);
+ } else {
+ f = getString(R.string.delete_song_desc_nosdcard);
+ }
String desc = String.format(f, mCurrentTrackName);
b.putString("description", desc);
b.putLongArray("items", list);