Eleven: make sure all lists are using consistent margins

https://cyanogen.atlassian.net/browse/MUSIC-57

Change-Id: Id94d8ab2a520cf79d28d897411515e522130271d

9 files changed, 17 insertions, 14 deletions

diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index ec99655..06719b3 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -8,7 +8,10 @@
         android:layout_height="50dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"
-        android:layout_margin="@dimen/list_preferred_item_padding" />
+        android:layout_marginTop="@dimen/list_preferred_item_padding"
+        android:layout_marginBottom="@dimen/list_preferred_item_padding"
+        android:layout_marginRight="@dimen/list_preferred_item_padding"
+        android:layout_marginLeft="@dimen/list_item_general_margin" />
 
     <LinearLayout
         android:id="@+id/right_container"
@@ -17,7 +20,8 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:layout_marginRight="@dimen/list_item_general_margin">
         <ImageView
             android:id="@+id/now_playing"
             android:layout_width="wrap_content"
diff --git a/res/layout/edit_queue_list_item.xml b/res/layout/edit_queue_list_item.xml
index 34c9577..b275134 100644
--- a/res/layout/edit_queue_list_item.xml
+++ b/res/layout/edit_queue_list_item.xml
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@+id/edit_track_list_item_handle"
         android:gravity="center_vertical"
-        android:paddingRight="@dimen/list_preferred_item_padding" >
+        android:paddingRight="@dimen/list_item_general_margin" >
 
         <include layout="@layout/list_item_queue" />
     </FrameLayout>
diff --git a/res/layout/edit_track_list_item.xml b/res/layout/edit_track_list_item.xml
index 234f494..ad92b41 100644
--- a/res/layout/edit_track_list_item.xml
+++ b/res/layout/edit_track_list_item.xml
@@ -35,7 +35,7 @@
         android:minHeight="@dimen/item_normal_height"
         android:paddingTop="@dimen/list_item_padding_top"
         android:paddingBottom="@dimen/list_item_padding_bottom"
-        android:paddingRight="@dimen/list_preferred_item_padding" >
+        android:paddingRight="@dimen/list_item_general_margin" >
 
         <include layout="@layout/list_item_common" />
     </RelativeLayout>
diff --git a/res/layout/grid_base.xml b/res/layout/grid_base.xml
index 112486b..99f1d28 100644
--- a/res/layout/grid_base.xml
+++ b/res/layout/grid_base.xml
@@ -26,8 +26,8 @@
         android:id="@+id/grid_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="@dimen/list_outer_edge_padding"
-        android:paddingRight="@dimen/list_outer_edge_padding"
+        android:paddingLeft="@dimen/list_item_general_margin"
+        android:paddingRight="@dimen/list_item_general_margin"
         android:cacheColorHint="@color/transparent"
         android:drawSelectorOnTop="true"
         android:fadingEdge="vertical"
diff --git a/res/layout/grid_header.xml b/res/layout/grid_header.xml
index 03b1bcc..16a256a 100644
--- a/res/layout/grid_header.xml
+++ b/res/layout/grid_header.xml
@@ -2,5 +2,5 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="8dp">
-    <!-- height should be list_outer_edge_padding - grid_item_vertical_spacing -->
+    <!-- height should be list_item_general_margin - grid_item_vertical_spacing -->
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/list_item_normal.xml b/res/layout/list_item_normal.xml
index b03b637..600a364 100644
--- a/res/layout/list_item_normal.xml
+++ b/res/layout/list_item_normal.xml
@@ -25,8 +25,8 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:paddingBottom="@dimen/list_item_padding_bottom"
-        android:paddingLeft="@dimen/list_preferred_item_padding"
-        android:paddingRight="@dimen/list_preferred_item_padding"
+        android:paddingLeft="@dimen/list_item_general_margin"
+        android:paddingRight="@dimen/list_item_general_margin"
         android:paddingTop="@dimen/list_item_padding_top">
 
         <include layout="@layout/list_item_common" />
diff --git a/res/layout/list_item_smart_playlist.xml b/res/layout/list_item_smart_playlist.xml
index 8f70be0..4d266ff 100644
--- a/res/layout/list_item_smart_playlist.xml
+++ b/res/layout/list_item_smart_playlist.xml
@@ -26,8 +26,8 @@
         android:layout_height="match_parent"
         android:gravity="center_vertical"
         android:paddingBottom="@dimen/list_item_padding_bottom"
-        android:paddingLeft="@dimen/list_preferred_item_padding"
-        android:paddingRight="@dimen/list_preferred_item_padding"
+        android:paddingLeft="@dimen/list_item_general_margin"
+        android:paddingRight="@dimen/list_item_general_margin"
         android:paddingTop="@dimen/list_item_padding_top">
 
         <include layout="@layout/list_item_common" />
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index aae5043..25616cd 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -26,8 +26,8 @@
         android:gravity="center_vertical"
         android:paddingTop="@dimen/list_item_padding_top"
         android:paddingBottom="@dimen/list_item_padding_bottom"
-        android:paddingLeft="@dimen/list_preferred_item_padding"
-        android:paddingRight="@dimen/list_preferred_item_padding" >
+        android:paddingLeft="@dimen/list_item_general_margin"
+        android:paddingRight="@dimen/list_item_general_margin" >
 
         <FrameLayout
             android:id="@+id/position_contanier"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index e3b9539..7bafbdc 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,7 +33,6 @@
 
     <!-- List and grid view padding -->
     <dimen name="list_preferred_item_padding">10.0dip</dimen>
-    <dimen name="list_outer_edge_padding">16.0dp</dimen>
     <dimen name="list_menu_item_padding_right">2.0dip</dimen>
     <dimen name="list_item_general_margin">16.0dip</dimen>
     <dimen name="list_item_menu_button_width">24.0dip</dimen>