commit 9e0f1fde0956ee7f5b76b77df7aea9b936e2c3a9
author Marco Nelissen <marcone@google.com> Sat Dec 12 13:41:34 2009 -0800
committer Marco Nelissen <marcone@google.com> Sat Dec 12 13:41:34 2009 -0800
tree e2626c377e88caf88e290b116f5c6a40f24401f1
parent 5edd0cbd1ae954dc8e97daef1a99375246bf985c

Fix some bugs when no music is present.

src/com/android/music/AlbumBrowserActivity.java

diff --git a/src/com/android/music/AlbumBrowserActivity.java b/src/com/android/music/AlbumBrowserActivity.java
index fa6eeb4..bfa683e 100644
--- a/src/com/android/music/AlbumBrowserActivity.java
+++ b/src/com/android/music/AlbumBrowserActivity.java
@@ -154,8 +154,10 @@
     @Override
     public void onDestroy() {
         ListView lv = getListView();
-        mLastListPosCourse = lv.getFirstVisiblePosition();
-        mLastListPosFine = lv.getChildAt(0).getTop();
+        if (lv != null) {
+            mLastListPosCourse = lv.getFirstVisiblePosition();
+            mLastListPosFine = lv.getChildAt(0).getTop();
+        }
         MusicUtils.unbindFromService(this);
         if (!mAdapterSent) {
             Cursor c = mAdapter.getCursor();
@@ -239,6 +241,7 @@
         }
 
         MusicUtils.hideDatabaseError(this);
+        MusicUtils.updateButtonBar(this, R.id.albumtab);
         setTitle();
     }
 

src/com/android/music/ArtistAlbumBrowserActivity.java

diff --git a/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index cc793df..46afeda 100644
--- a/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@ -160,8 +160,10 @@
     @Override
     public void onDestroy() {
         ExpandableListView lv = getExpandableListView();
-        mLastListPosCourse = lv.getFirstVisiblePosition();
-        mLastListPosFine = lv.getChildAt(0).getTop();
+        if (lv != null) {
+            mLastListPosCourse = lv.getFirstVisiblePosition();
+            mLastListPosFine = lv.getChildAt(0).getTop();
+        }
         
         MusicUtils.unbindFromService(this);
         if (!mAdapterSent) {
@@ -248,6 +250,7 @@
         }
 
         MusicUtils.hideDatabaseError(this);
+        MusicUtils.updateButtonBar(this, R.id.artisttab);
         setTitle();
     }
 

src/com/android/music/MusicUtils.java

diff --git a/src/com/android/music/MusicUtils.java b/src/com/android/music/MusicUtils.java
index 1acadea..2108b8d 100644
--- a/src/com/android/music/MusicUtils.java
+++ b/src/com/android/music/MusicUtils.java
@@ -636,6 +636,10 @@
         if (v != null) {
             v.setVisibility(View.GONE);
         }
+        v = a.findViewById(R.id.buttonbar);
+        if (v != null) {
+            v.setVisibility(View.GONE);
+        }
         TextView tv = (TextView) a.findViewById(R.id.sd_message);
         tv.setText(message);
     }

src/com/android/music/PlaylistBrowserActivity.java

diff --git a/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index fb719b2..edd8d4f 100644
--- a/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
@@ -175,8 +175,10 @@
     @Override
     public void onDestroy() {
         ListView lv = getListView();
-        mLastListPosCourse = lv.getFirstVisiblePosition();
-        mLastListPosFine = lv.getChildAt(0).getTop();
+        if (lv != null) {
+            mLastListPosCourse = lv.getFirstVisiblePosition();
+            mLastListPosFine = lv.getChildAt(0).getTop();
+        }
         MusicUtils.unbindFromService(this);
         if (!mAdapterSent) {
             Cursor c = mAdapter.getCursor();
@@ -241,6 +243,7 @@
             mLastListPosCourse = -1;
         }
         MusicUtils.hideDatabaseError(this);
+        MusicUtils.updateButtonBar(this, R.id.playlisttab);
         setTitle();
     }
 

src/com/android/music/TrackBrowserActivity.java

diff --git a/src/com/android/music/TrackBrowserActivity.java b/src/com/android/music/TrackBrowserActivity.java
index 52559cf..53fc34d 100644
--- a/src/com/android/music/TrackBrowserActivity.java
+++ b/src/com/android/music/TrackBrowserActivity.java
@@ -234,8 +234,10 @@
     @Override
     public void onDestroy() {
         ListView lv = getListView();
-        mLastListPosCourse = lv.getFirstVisiblePosition();
-        mLastListPosFine = lv.getChildAt(0).getTop();
+        if (lv != null) {
+            mLastListPosCourse = lv.getFirstVisiblePosition();
+            mLastListPosFine = lv.getChildAt(0).getTop();
+        }
         MusicUtils.unbindFromService(this);
         try {
             if ("nowplaying".equals(mPlaylist)) {
@@ -360,6 +362,7 @@
         }
 
         MusicUtils.hideDatabaseError(this);
+        MusicUtils.updateButtonBar(this, R.id.songtab);
         setTitle();
 
         // When showing the queue, position the selection on the currently playing track