Eleven: Add context menus to all top level fragments and playlists

This is part 1/2 - will add it to album detali/artist detail page after
Added helper pop up menu class
This also merged songfragment with basicsongframent because of the large similarities

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

Change-Id: I9951fe7238aaff7599f0cb6f655f0677f998bb6b

16 files changed, 50 insertions, 15 deletions

diff --git a/res/drawable-hdpi/menu_button.png b/res/drawable-hdpi/menu_button_light.png
index c640606..c640606 100644
--- a/res/drawable-hdpi/menu_button.png
+++ b/res/drawable-hdpi/menu_button_light.png
diff --git a/res/drawable-mdpi/menu_button.png b/res/drawable-mdpi/menu_button_light.png
index 9d63177..9d63177 100644
--- a/res/drawable-mdpi/menu_button.png
+++ b/res/drawable-mdpi/menu_button_light.png
diff --git a/res/drawable-xhdpi/menu_button.png b/res/drawable-xhdpi/menu_button.png
deleted file mode 100644
index 67fdc8c..0000000
--- a/res/drawable-xhdpi/menu_button.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/menu_button_light.png b/res/drawable-xhdpi/menu_button_light.png
index 9112f57..67fdc8c 100644
--- a/res/drawable-xhdpi/menu_button_light.png
+++ b/res/drawable-xhdpi/menu_button_light.png
diff --git a/res/drawable-xxhdpi/menu_button.png b/res/drawable-xxhdpi/menu_button.png
index 055dfc2..8eac8ef 100644
--- a/res/drawable-xxhdpi/menu_button.png
+++ b/res/drawable-xxhdpi/menu_button.png
diff --git a/res/drawable-xxhdpi/menu_item_button.png b/res/drawable-xxhdpi/menu_item_button.png
deleted file mode 100644
index 8eac8ef..0000000
--- a/res/drawable-xxhdpi/menu_item_button.png
+++ /dev/null
diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml
index 1a37b99..876a29e 100644
--- a/res/layout/activity_album_detail.xml
+++ b/res/layout/activity_album_detail.xml
@@ -19,7 +19,7 @@
             android:layout_alignParentRight="true"
             android:layout_marginBottom="40dp"
             android:gravity="center"
-            android:src="@drawable/menu_item_button" />
+            android:src="@drawable/menu_button" />
 
         <ImageView
             android:id="@+id/album_art"
diff --git a/res/layout/activity_player_fragment.xml b/res/layout/activity_player_fragment.xml
index 9e438be..283e6ee 100644
--- a/res/layout/activity_player_fragment.xml
+++ b/res/layout/activity_player_fragment.xml
@@ -79,7 +79,7 @@
                 android:layout_height="@dimen/audio_player_controls_top_button_height"
                 android:layout_weight="0"
                 android:scaleType="centerInside"
-                android:src="@drawable/menu_button" />
+                android:src="@drawable/menu_button_light" />
         </LinearLayout>
 
         <RelativeLayout
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index 062128f..2420e31 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -12,7 +12,7 @@
         android:layout_alignParentRight="true"
         android:layout_marginBottom="2dp"
         android:gravity="center"
-        android:src="@drawable/menu_item_button" />
+        android:src="@drawable/menu_button" />
 
     <TextView
         android:id="@+id/title"
diff --git a/res/layout/artist_detail_album.xml b/res/layout/artist_detail_album.xml
index 93131a2..10ec00d 100644
--- a/res/layout/artist_detail_album.xml
+++ b/res/layout/artist_detail_album.xml
@@ -22,7 +22,7 @@
         android:layout_marginBottom="1dp"
         android:layout_marginRight="-2dp"
         android:gravity="center"
-        android:src="@drawable/menu_item_button" />
+        android:src="@drawable/menu_button" />
 
     <TextView
         android:id="@+id/title"
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index 4db05f2..28d193f 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -20,7 +20,7 @@
         android:layout_alignParentRight="true"
         android:layout_marginBottom="2dp"
         android:gravity="center"
-        android:src="@drawable/menu_item_button" />
+        android:src="@drawable/menu_button" />
 
     <TextView
         android:id="@+id/title"
diff --git a/res/layout/grid_items_normal.xml b/res/layout/grid_items_normal.xml
index f61af9a..91f9374 100644
--- a/res/layout/grid_items_normal.xml
+++ b/res/layout/grid_items_normal.xml
@@ -33,14 +33,24 @@
             style="@style/ListItemMainText.Grid.Single"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true" />
+            android:layout_alignParentTop="true"
+            android:layout_toLeftOf="@+id/popup_menu_button"/>
 
         <TextView
             android:id="@+id/line_two"
             style="@style/ListItemSecondaryText.Grid.Single"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/line_one" />
+            android:layout_below="@+id/line_one"
+            android:layout_toLeftOf="@id/popup_menu_button" />
+
+        <com.cyngn.eleven.widgets.PopupMenuButton
+            android:id="@id/popup_menu_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/menu_button" />
     </RelativeLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index 4ba3914..f9f09ee 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -34,6 +34,15 @@
         style="@style/ListItemSecondaryText.Single"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_toLeftOf="@+id/popup_menu_button"
         android:layout_centerVertical="true" />
+
+    <com.cyngn.eleven.widgets.PopupMenuButton
+        android:id="@id/popup_menu_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/menu_button" />
+
 </merge>
\ No newline at end of file
diff --git a/res/layout/list_item_queue.xml b/res/layout/list_item_queue.xml
index ddbc66f..5cd9111 100644
--- a/res/layout/list_item_queue.xml
+++ b/res/layout/list_item_queue.xml
@@ -43,7 +43,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
+        android:layout_toLeftOf="@+id/popup_menu_button"
         android:paddingLeft="@dimen/list_item_progress_padding_left"
         android:paddingRight="@dimen/list_item_progress_padding_right">
         <include
@@ -52,4 +52,12 @@
             android:layout_centerVertical="true"
             layout="@layout/play_pause_progress_button"/>
     </FrameLayout>
+
+    <com.cyngn.eleven.widgets.PopupMenuButton
+        android:id="@id/popup_menu_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:src="@drawable/menu_button_light" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/list_item_simple.xml b/res/layout/list_item_simple.xml
index 1516e09..39371e8 100644
--- a/res/layout/list_item_simple.xml
+++ b/res/layout/list_item_simple.xml
@@ -55,8 +55,16 @@
             style="@style/ListItemSecondaryText.Single"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
+            android:layout_toLeftOf="@+id/popup_menu_button"
             android:layout_centerVertical="true" />
+
+        <com.cyngn.eleven.widgets.PopupMenuButton
+            android:id="@id/popup_menu_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:src="@drawable/menu_button" />
     </RelativeLayout>
 
     <ImageView
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
index a564963..9a8bfb6 100644
--- a/res/layout/list_item_top_tracks.xml
+++ b/res/layout/list_item_top_tracks.xml
@@ -56,7 +56,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/list_item_image_height"
             android:layout_toRightOf="@+id/position_contanier"
-            android:layout_toLeftOf="@+id/line_one_right"
+            android:layout_toLeftOf="@+id/popup_menu_button"
             android:gravity="center_vertical"
             android:minHeight="@dimen/item_normal_height"
             android:paddingLeft="@dimen/list_preferred_item_padding" >
@@ -75,13 +75,13 @@
                 android:layout_below="@+id/line_one" />
         </RelativeLayout>
 
-        <TextView
-            android:id="@+id/line_one_right"
-            style="@style/ListItemSecondaryText.Single"
+        <com.cyngn.eleven.widgets.PopupMenuButton
+            android:id="@id/popup_menu_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
-            android:layout_centerVertical="true" />
+            android:layout_centerVertical="true"
+            android:src="@drawable/menu_button" />
     </RelativeLayout>
 
     <ImageView