More Music fit & finish fixes.

- Don't flash the unused title bar when launching
- Fix a flickering issue when switching tabs

Change-Id: Iba4a5bbb8403d76cc02601922970ea341815551b
Bug: 2324645

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9dadb44..5643369 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,7 +31,9 @@
             android:name="android.app.default_searchable"
             android:value=".QueryBrowserActivity"
         />
-        <activity android:name="MusicBrowserActivity">
+        <activity android:name="MusicBrowserActivity"
+            android:theme="@android:style/Theme.NoTitleBar"
+        >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/src/com/android/music/ArtistAlbumBrowserActivity.java b/src/com/android/music/ArtistAlbumBrowserActivity.java
index 0fd7735..11ea0c3 100644 (file)
--- a/src/com/android/music/ArtistAlbumBrowserActivity.java
+++ b/src/com/android/music/ArtistAlbumBrowserActivity.java
@@ -79,10 +79,6 @@ public class ArtistAlbumBrowserActivity extends ExpandableListActivity
     private static int mLastListPosCourse = -1;
     private static int mLastListPosFine = -1;
 
-    public void onTabClick(View v) {
-        MusicUtils.processTabClick(this, v, R.id.artisttab);
-    }
-
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle icicle) {

diff --git a/src/com/android/music/MusicUtils.java b/src/com/android/music/MusicUtils.java
index 2108b8d..a67db7d 100644 (file)
--- a/src/com/android/music/MusicUtils.java
+++ b/src/com/android/music/MusicUtils.java
@@ -50,7 +50,6 @@ import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.LinearLayout;
 import android.widget.TabWidget;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -1077,6 +1076,7 @@ public class MusicUtils {
                 ll.setCurrentTab(i);
                 sActiveTabIndex = i;
             }
+            v.setTag(i);
             v.setOnFocusChangeListener(new View.OnFocusChangeListener() {
 
                 public void onFocusChange(View v, boolean hasFocus) {
@@ -1095,7 +1095,6 @@ public class MusicUtils {
 
                 public void onClick(View v) {
                     processTabClick((Activity)ll.getContext(), v, ll.getChildAt(sActiveTabIndex).getId());
-                    
                 }});
         }
     }
@@ -1105,6 +1104,10 @@ public class MusicUtils {
         if (id == current) {
             return;
         }
+
+        final TabWidget ll = (TabWidget) a.findViewById(R.id.buttonbar);
+        ll.setCurrentTab((Integer) v.getTag());
+
         activateTab(a, id);
         if (id != R.id.nowplayingtab) {
             setIntPref(a, "activetab", id);