aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-03-05 19:11:02 -0800
committerScott Jackson <daneren2005@gmail.com>2014-03-05 19:11:02 -0800
commit2516c2b93b7220f95c0e710cfaeeaef74dce1b4a (patch)
tree695d4730dcf835a4e2005b17eda0c0eb11c84c8d
parent1c0cb1bc1aad53fb052963264d390700ee0dc6e0 (diff)
downloaddsub-2516c2b93b7220f95c0e710cfaeeaef74dce1b4a.tar.gz
dsub-2516c2b93b7220f95c0e710cfaeeaef74dce1b4a.tar.bz2
dsub-2516c2b93b7220f95c0e710cfaeeaef74dce1b4a.zip
#297 Screen on/off change to checkbox
-rw-r--r--res/menu/nowplaying.xml7
-rw-r--r--res/values-es/strings.xml1
-rw-r--r--res/values-hu/strings.xml1
-rw-r--r--res/values-ru/strings.xml1
-rw-r--r--res/values/strings.xml1
-rw-r--r--src/github/daneren2005/dsub/fragments/DownloadFragment.java2
6 files changed, 6 insertions, 7 deletions
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index b67ecf64..1d720464 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:compat="http://schemas.android.com/apk/res-auto">
+ xmlns:compat="http://schemas.android.com/apk/res-auto"
+ android:checkableBehavior="all">
+
<item
android:id="@+id/menu_shuffle"
android:icon="?attr/shuffle"
@@ -28,7 +30,8 @@
<item
android:id="@+id/menu_screen_on_off"
- android:title="@string/download.menu_screen_on"/>
+ android:title="@string/download.menu_screen_on"
+ android:checkable="true"/>
<item
android:id="@+id/menu_toggle_timer"
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 6b3e7c5b..2b7a62b8 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -160,7 +160,6 @@
<string name="download.menu_remove">Eliminar de la cola</string>
<string name="download.menu_remove_all">Borrar todo</string>
<string name="download.menu_screen_on">Pantalla encendida</string>
- <string name="download.menu_screen_off">Pantalla apagada</string>
<string name="download.menu_shuffle">Aleatorio</string>
<string name="download.menu_toggle">Cambiar</string>
<string name="download.menu_save">Guardar lista de reproducción</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 3cdab47c..0d31d6e4 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -162,7 +162,6 @@
<string name="download.menu_remove">Eltávolítás a várólistáról</string>
<string name="download.menu_remove_all">Összes eltávolítása</string>
<string name="download.menu_screen_on">Kijelző be</string>
- <string name="download.menu_screen_off">Kijelző ki</string>
<string name="download.menu_shuffle">Kevert sorrendben</string>
<string name="download.menu_toggle">Váltás</string>
<string name="download.menu_save">Mentés lejátszási listába</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f53a421c..d4edbf46 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -112,7 +112,6 @@
<string name="download.menu_remove">Убрать из очереди</string>
<string name="download.menu_remove_all">Очистить</string>
<string name="download.menu_screen_on">Включить подсветку</string>
- <string name="download.menu_screen_off">Отключать подсветку</string>
<string name="download.menu_shuffle">Перемешать</string>
<string name="download.menu_toggle">Переключатель</string>
<string name="download.menu_save">Сохранить список</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 319396d3..bcd2c6bf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -162,7 +162,6 @@
<string name="download.menu_remove">Remove from queue</string>
<string name="download.menu_remove_all">Remove all</string>
<string name="download.menu_screen_on">Screen on</string>
- <string name="download.menu_screen_off">Screen off</string>
<string name="download.menu_shuffle">Shuffle</string>
<string name="download.menu_toggle">Toggle</string>
<string name="download.menu_save">Save playlist</string>
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index 409e6270..0ff53cff 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -498,7 +498,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
}
}
if(downloadService != null && downloadService.getKeepScreenOn() && nowPlaying) {
- menu.findItem(R.id.menu_screen_on_off).setTitle(R.string.download_menu_screen_off);
+ menu.findItem(R.id.menu_screen_on_off).setChecked(true);
}
if(downloadService != null) {
MenuItem mediaRouteItem = menu.findItem(R.id.menu_mediaroute);