Merge remote-tracking branch 'upstream/master'

1 files changed, 10 insertions, 9 deletions

diff --git a/subsonic-android/res/layout/main_buttons.xml b/subsonic-android/res/layout/main_buttons.xml
index 969ad99e..655854be 100644
--- a/subsonic-android/res/layout/main_buttons.xml
+++ b/subsonic-android/res/layout/main_buttons.xml
@@ -48,16 +48,17 @@
             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

             android:textAppearance="?android:attr/textAppearanceSmall"

-            android:textColor="#EFEFEF"

-            android:textStyle="bold"

-            android:background="#A5A5A5"

+            android:textColor="@color/cyan"

             android:gravity="center_vertical"

-            android:paddingLeft="4dp"/>

+            android:paddingLeft="6dp"

+			android:textAllCaps="true"

+			android:textStyle="bold"

+			android:textSize="16sp"/>

 

     <TextView

             android:id="@+id/main_albums_newest"

             android:text="@string/main.albums_newest"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -69,7 +70,7 @@
     <TextView

             android:id="@+id/main_albums_recent"

             android:text="@string/main.albums_recent"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -81,7 +82,7 @@
     <TextView

             android:id="@+id/main_albums_frequent"

             android:text="@string/main.albums_frequent"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -93,7 +94,7 @@
     <TextView

             android:id="@+id/main_albums_highest"

             android:text="@string/main.albums_highest"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"

@@ -105,7 +106,7 @@
     <TextView

             android:id="@+id/main_albums_random"

             android:text="@string/main.albums_random"

-            android:drawableRight="@drawable/list_item_artist"

+            android:drawableRight="@drawable/list_item_more"

             android:drawablePadding="6dip"

             android:layout_width="fill_parent"

             android:layout_height="wrap_content"