Eleven : Vertically align the Song info and Album info in the Album detail view

https://cyanogen.atlassian.net/browse/MUSIC-103
https://cyanogen.atlassian.net/browse/MUSIC-104

Change-Id: I283ed37ed0208ad5b66eeee0934b8e03faa07207

2 files changed, 81 insertions, 75 deletions

diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml
index dff83e2..9c87539 100644
--- a/res/layout/activity_album_detail.xml
+++ b/res/layout/activity_album_detail.xml
@@ -19,66 +19,72 @@
             android:layout_alignParentTop="true"
             android:layout_alignParentLeft="true" />
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
+        <RelativeLayout
+            android:id="@+id/header_info"
+            android:layout_width="wrap_content"
+            android:layout_height="fill_parent"
             android:layout_toRightOf="@id/album_art"
-            android:layout_marginTop="21dp"
-            android:singleLine="true"
-            android:fontFamily="sans-serif"
-            android:textStyle="bold"
-            android:textSize="@dimen/text_size_large"
-            android:textColor="@color/default_text_color" />
+            android:gravity="center_vertical" >
 
-        <TextView
-            android:id="@+id/song_count_and_year"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/title"
-            android:layout_toRightOf="@id/album_art"
-            android:singleLine="true"
-            android:fontFamily="sans-serif-light"
-            android:textSize="@dimen/text_size_micro"
-            android:textColor="@color/default_text_color" />
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentTop="true"
+                android:singleLine="true"
+                android:fontFamily="sans-serif"
+                android:textStyle="bold"
+                android:textSize="@dimen/text_size_large"
+                android:textColor="@color/default_text_color" />
 
-        <TextView
-            android:id="@+id/genre"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/song_count_and_year"
-            android:layout_toRightOf="@id/album_art"
-            android:layout_marginRight="@dimen/standard_padding"
-            android:singleLine="true"
-            android:fontFamily="sans-serif-light"
-            android:textSize="@dimen/text_size_micro"
-            android:textColor="@color/default_text_color"
-            android:visibility="gone"
-            android:layout_marginTop="4dp" />
+            <TextView
+                android:id="@+id/song_count_and_year"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/title"
+                android:singleLine="true"
+                android:fontFamily="sans-serif-light"
+                android:textSize="@dimen/text_size_micro"
+                android:textColor="@color/default_text_color" />
 
-        <ImageView
-            android:id="@+id/duration_icon"
-            android:layout_width="10dp"
-            android:layout_height="12dp"
-            android:layout_below="@id/song_count_and_year"
-            android:layout_toRightOf="@id/genre"
-            android:layout_marginTop="6dp"
-            android:layout_marginRight="4dp"
-            android:gravity="center"
-            android:src="@drawable/stopwatch_icon_small_grey" />
+            <TextView
+                android:id="@+id/genre"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/song_count_and_year"
+                android:layout_marginRight="@dimen/standard_padding"
+                android:singleLine="true"
+                android:fontFamily="sans-serif-light"
+                android:textSize="@dimen/text_size_micro"
+                android:textColor="@color/default_text_color"
+                android:visibility="gone"
+                android:layout_marginTop="4dp" />
+
+            <ImageView
+                android:id="@+id/duration_icon"
+                android:layout_width="10dp"
+                android:layout_height="12dp"
+                android:layout_below="@id/song_count_and_year"
+                android:layout_toRightOf="@id/genre"
+                android:layout_alignTop="@+id/duration"
+                android:layout_alignBottom="@+id/duration"
+                android:layout_marginRight="4dp"
+                android:gravity="center"
+                android:src="@drawable/stopwatch_icon_small_grey" />
+
+            <TextView
+                android:id="@+id/duration"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/song_count_and_year"
+                android:layout_toRightOf="@id/duration_icon"
+                android:singleLine="true"
+                android:fontFamily="sans-serif-light"
+                android:textSize="@dimen/text_size_micro"
+                android:textColor="@color/default_text_color"
+                android:layout_marginTop="4dp" />
+        </RelativeLayout>
 
-        <TextView
-            android:id="@+id/duration"
-            android:layout_width="60dp"
-            android:layout_height="30dp"
-            android:layout_below="@id/song_count_and_year"
-            android:layout_toRightOf="@id/duration_icon"
-            android:singleLine="true"
-            android:fontFamily="sans-serif-light"
-            android:textSize="@dimen/text_size_micro"
-            android:textColor="@color/default_text_color"
-            android:layout_marginTop="4dp" />
     </RelativeLayout>
 
     <include
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index f3c660e..7638bf4 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -26,28 +26,28 @@
             android:src="@drawable/menu_button" />
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/title"
-        style="@style/ListItemMainText.Single"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentLeft="true"
+    <RelativeLayout
+        android:id="@+id/song_info"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
         android:layout_toLeftOf="@id/right_container"
-        android:paddingTop="6dp"
-        android:layout_marginTop="@dimen/list_preferred_item_padding"
-        android:layout_marginLeft="@dimen/list_item_general_margin" />
+        android:layout_marginLeft="@dimen/list_item_general_margin"
+        android:gravity="center_vertical">
 
-    <TextView
-        android:id="@+id/duration"
-        style="@style/ListItemSecondaryText.Single"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/title"
-        android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/right_container"
-        android:layout_marginTop="-2dp"
-        android:layout_marginLeft="@dimen/list_item_general_margin" />
+        <TextView
+            android:id="@+id/title"
+            style="@style/ListItemMainText.Single"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:id="@+id/duration"
+            style="@style/ListItemSecondaryText.Single"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/title" />
+
+    </RelativeLayout>
 
     <ImageView
         android:id="@+id/divider"