From 30847da1fd577f08bd02803b788c908df6f8c791 Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Thu, 16 Oct 2014 19:10:04 -0700
Subject: #386 Add shuffle genre to Tasker options

---
 res/layout/edit_play_action.xml | 20 ++++++++++++++++++--
 res/values/strings.xml          |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/layout/edit_play_action.xml b/res/layout/edit_play_action.xml
index 1043e2e2..ef5408ee 100644
--- a/res/layout/edit_play_action.xml
+++ b/res/layout/edit_play_action.xml
@@ -10,7 +10,6 @@
 		android:layout_height="wrap_content">
 
 		<TextView
-			android:id="@+id/edit_shuffle"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
@@ -30,7 +29,24 @@
 		android:layout_height="wrap_content">
 
 		<TextView
-			android:id="@+id/edit_offline_label"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginLeft="4dp"
+			android:textSize="20dp"
+			android:text="@string/tasker.edit_shuffle_genre"/>
+
+		<Button
+			android:id="@+id/edit_genre_spinner"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"/>
+	</LinearLayout>
+
+	<LinearLayout
+		android:orientation="horizontal"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content">
+
+		<TextView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="4dp"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 15dc020d..8d7cc873 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -559,6 +559,7 @@
 	<string name="tasker.start_playing_shuffled">Start playing in Shuffle Mode</string>
 	<string name="tasker.start_playing_title">Tasker -> Start DSub</string>
 	<string name="tasker.edit_shuffle_mode">Start in shuffle mode: </string>
+	<string name="tasker.edit_shuffle_genre">Shuffle from genre:</string>
 	<string name="tasker.edit_server_offline">Toggle offline: </string>
 	<string name="tasker.edit_do_nothing">Do Nothing</string>
 
-- 
cgit v1.2.3