[Android] Audio: invert songs and album/artist

[Jean-Baptiste Kempf]

android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jun 20 23:27:30 2012 +0200| [d92f830daa6b381f578fb93890828ff4ce023ed1] | committer: Jean-Baptiste Kempf

Audio: invert songs and album/artist

> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=d92f830daa6b381f578fb93890828ff4ce023ed1
---

 vlc-android/res/layout/audio_browser.xml           |   26 ++++++++++----------
 .../vlc/gui/audio/AudioBrowserActivity.java        |    8 +++---
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/vlc-android/res/layout/audio_browser.xml b/vlc-android/res/layout/audio_browser.xml
index 207b643..5204b38 100644
--- a/vlc-android/res/layout/audio_browser.xml
+++ b/vlc-android/res/layout/audio_browser.xml
@@ -18,26 +18,26 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
             <TextView
-                android:text="@string/songs"
+                android:text="@string/artists"
                 android:textSize="16dip"
                 android:textColor="#ffffff"
-                android:id="@+id/songs"
+                android:id="@+id/artists"
                 android:layout_width="80dip"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal" />
             <TextView
-                android:text="@string/artists"
+                android:text="@string/albums"
                 android:textSize="16dip"
                 android:textColor="#888888"
-                android:id="@+id/artists"
+                android:id="@+id/albums"
                 android:layout_width="80dip"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal" />
             <TextView
-                android:text="@string/albums"
+                android:text="@string/songs"
                 android:textSize="16dip"
                 android:textColor="#888888"
-                android:id="@+id/albums"
+                android:id="@+id/songs"
                 android:layout_width="80dip"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal" />
@@ -59,13 +59,6 @@
         android:id="@+id/content"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
-        <ListView
-            android:id="@+id/songs_list"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:divider="@color/item_common"
-            android:dividerHeight="1dp"
-            android:fastScrollEnabled="true" />
         <ExpandableListView
             android:id="@+id/artists_list"
             android:layout_width="fill_parent"
@@ -84,6 +77,13 @@
             android:dividerHeight="1dp"
             android:groupIndicator="@null"
             android:fastScrollEnabled="true" />
+       <ListView
+            android:id="@+id/songs_list"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:divider="@color/item_common"
+            android:dividerHeight="1dp"
+            android:fastScrollEnabled="true" />
         <ExpandableListView
             android:id="@+id/genres_list"
             android:layout_width="fill_parent"
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserActivity.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserActivity.java
index bf02608..71da3d7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioBrowserActivity.java
@@ -79,10 +79,12 @@ public class AudioBrowserActivity extends Activity implements ISortable {
     public final static int SORT_BY_LENGTH = 1;
     private boolean mSortReverse = false;
     private int mSortBy = SORT_BY_TITLE;
-    public final static int MODE_SONG = 0;
-    public final static int MODE_ARTIST = 1;
-    public final static int MODE_ALBUM = 2;
+    
+    public final static int MODE_ARTIST = 0;
+    public final static int MODE_ALBUM = 1;
+    public final static int MODE_SONG = 2;
     public final static int MODE_GENRE = 3;
+    
     public final static int MENU_PLAY = Menu.FIRST;
     public final static int MENU_APPEND = Menu.FIRST + 1;
     public final static int MENU_PLAY_ALL = Menu.FIRST + 2;