diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-10-20 20:19:10 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-10-20 20:19:10 -0700 |
| commit | fdb8b2d94dc8a9ac216eb501a514b47199092949 (patch) | |
| tree | e330c9a5da311fbb477646a768904cfda8e8aa5e /res | |
| parent | 3aca5d5f895ebf3283ffc0b05eb3cfbfd526d440 (diff) | |
| parent | 08c7e436bdd25e72a386b45e2bdbb719ffde8f3c (diff) | |
| download | dsub-fdb8b2d94dc8a9ac216eb501a514b47199092949.tar.gz dsub-fdb8b2d94dc8a9ac216eb501a514b47199092949.tar.bz2 dsub-fdb8b2d94dc8a9ac216eb501a514b47199092949.zip | |
Merge branch 'Tasker'
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/edit_play_action.xml | 95 | ||||
| -rw-r--r-- | res/values/arrays.xml | 6 | ||||
| -rw-r--r-- | res/values/strings.xml | 5 |
3 files changed, 105 insertions, 1 deletions
diff --git a/res/layout/edit_play_action.xml b/res/layout/edit_play_action.xml index 6eb3b651..a1115da6 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" @@ -23,4 +22,98 @@ android:longClickable="true" /> </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" + android:textSize="20dp" + android:text="@string/tasker.edit_shuffle_start_year" /> + + <CheckBox + android:id="@+id/edit_start_year_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:longClickable="true" + android:enabled="false"/> + + <EditText + android:id="@+id/edit_start_year" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="number" + android:hint="@string/shuffle.startYear" + android:enabled="false"/> + </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" + android:textSize="20dp" + android:text="@string/tasker.edit_shuffle_end_year" /> + + <CheckBox + android:id="@+id/edit_end_year_checkbox" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:longClickable="true" + android:enabled="false"/> + + <EditText + android:id="@+id/edit_end_year" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="number" + android:hint="@string/shuffle.endYear" + android:enabled="false"/> + </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" + 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" + style="?android:attr/spinnerStyle" + android:enabled="false"/> + </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" + android:textSize="20dp" + android:text="@string/tasker.edit_server_offline"/> + + <Spinner + android:id="@+id/edit_offline_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 3e85c982..19758562 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -235,4 +235,10 @@ <item>@string/settings.replay_gain_type.album</item> <item>@string/settings.replay_gain_type.track</item> </string-array> + + <string-array name="editServerOptions"> + <item>@string/tasker.edit_do_nothing</item> + <item>@string/main.online</item> + <item>@string/main.offline</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0fdb2361..33a40981 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -559,6 +559,11 @@ <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_start_year">Shuffle start year:</string>
+ <string name="tasker.edit_shuffle_end_year">Shuffle end year:</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>
<plurals name="select_album_n_songs">
<item quantity="zero">No songs</item>
|