Great progress with the new now playing screen. Almost done now.

app/src/main/res/layout/fragment_player.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.sothree.slidinguppanel.SlidingUpPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.sothree.slidinguppanel.SlidingUpPanelLayout
+    android:id="@+id/player_sliding_layout"
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/tools"
     xmlns:sothree="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/player_sliding_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clickable="false"
@@ -79,30 +80,47 @@
             app:cardElevation="@dimen/card_elevation"
             app:cardUseCompatPadding="false">
 
-            <LinearLayout
+            <RelativeLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="wrap_content">
 
-                <include android:id="@+id/current_song" layout="@layout/item_list" />
-
-                <TextView
-                    android:id="@+id/player_queue_subheader"
-                    android:gravity="center_vertical"
-                    android:text="Up next"
-                    android:paddingLeft="16dp"
-                    android:paddingRight="16dp"
-                    android:textColor="?android:textColorSecondary"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-                    android:layout_width="match_parent"
-                    android:layout_height="48dp" />
-
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/player_recycler_view"
-                    android:layout_width="match_parent"
+                <!--This is necessary for the drag sorting to work at the top-->
+                <View
+                    android:layout_alignTop="@+id/card_content"
+                    android:layout_alignBottom="@+id/card_content"
+                    android:id="@+id/draggable_area"
+                    android:layout_width="72dp"
                     android:layout_height="wrap_content" />
 
-            </LinearLayout>
+                <LinearLayout
+                    android:id="@+id/card_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <include
+                        android:id="@+id/current_song"
+                        layout="@layout/item_list" />
+
+                    <TextView
+                        android:id="@+id/player_queue_subheader"
+                        android:layout_width="match_parent"
+                        android:layout_height="48dp"
+                        android:gravity="center_vertical"
+                        android:paddingLeft="16dp"
+                        android:paddingRight="16dp"
+                        android:text="@string/up_next"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
+                        android:textColor="?android:textColorSecondary" />
+
+                    <android.support.v7.widget.RecyclerView
+                        android:id="@+id/player_recycler_view"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                </LinearLayout>
+
+            </RelativeLayout>
 
         </android.support.v7.widget.CardView>
 

app/src/main/res/layout/item_list.xml

@@ -12,9 +12,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|start"
-        android:layout_marginLeft="-12dp"
-        android:layout_marginStart="-12dp"
-        android:src="@drawable/ic_equal_white_24dp"
+        android:layout_marginLeft="-8dp"
+        android:layout_marginStart="-8dp"
+        android:src="@drawable/ic_drag_vertical_white_24dp"
         android:tint="?icon_color"
         tools:ignore="ContentDescription" />
 

app/src/main/res/layout/item_list_single_row.xml

@@ -12,9 +12,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|start"
-        android:layout_marginLeft="-12dp"
-        android:layout_marginStart="-12dp"
-        android:src="@drawable/ic_equal_white_24dp"
+        android:layout_marginLeft="-8dp"
+        android:layout_marginStart="-8dp"
+        android:src="@drawable/ic_drag_vertical_white_24dp"
         android:tint="?icon_color"
         tools:ignore="ContentDescription" />
 

app/src/main/res/values/strings.xml

@@ -205,7 +205,5 @@
     <string name="aleksandar_tesic_summary">For helping me with the design.</string>
     <string name="website">Website</string>
     <string name="loading_products">Loading products…</string>
-
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="up_next">Up next</string>
 </resources>