diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4c366b64..aa60c09e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -62,7 +62,6 @@ THE SOFTWARE. Genre einreihen Warteschlange leeren Warteschlange anzeigen + Warteschlange Steuerelemente ein/-ausblenden 1 Titel wird abgespielt. diff --git a/res/values/translatable.xml b/res/values/translatable.xml index 3f93c1c7..97d1e317 100644 --- a/res/values/translatable.xml +++ b/res/values/translatable.xml @@ -233,5 +233,6 @@ THE SOFTWARE. Enqueue genre Clear queue Show queue + Queue Toggle controls diff --git a/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java b/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java index 6d42171e..547a18ae 100644 --- a/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java +++ b/src/ch/blinkenlights/android/vanilla/ShowQueueActivity.java @@ -27,6 +27,7 @@ import java.util.Arrays; import android.app.Activity; import android.os.Bundle; import android.view.View; +import android.view.MenuItem; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.AdapterView.OnItemLongClickListener; @@ -41,8 +42,10 @@ public class ShowQueueActivity extends Activity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setTitle(R.string.queue); setContentView(R.layout.showqueue_listview); + mListView = (ListView) findViewById(R.id.list); listAdapter = new ShowQueueAdapter(this, R.layout.showqueue_row); mListView.setAdapter(listAdapter); @@ -66,6 +69,16 @@ public class ShowQueueActivity extends Activity { } + /* + ** Called when the user hits the ActionBar item + ** There is only one item (title) and it should quit this activity + */ + @Override + public boolean onOptionsItemSelected(MenuItem item) { + finish(); + return true; + } + /* ** Called when we are displayed (again) ** This will always refresh the whole song list