norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

ActionBar for playback activity

Browse Source
This commit is contained in:
Christopher Eby 2012-02-05 03:27:00 -06:00
parent 7c3fe82637
commit 61f4d1119d
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -37,7 +37,7 @@ THE SOFTWARE.
android:backupAgent="PreferencesBackupAgent">
<activity
android:name="FullPlaybackActivity"
android:theme="@style/NoBackground"
android:theme="@style/Playback"
android:launchMode="singleTask" />
<activity
android:name="LibraryActivity"

10
res/values-v11/untranslatable.xml
View File

@ -22,11 +22,17 @@ THE SOFTWARE.
-->
<resources>
<style name="Dialog" parent="android:Theme.Holo.Dialog" />
<style name="Theme" parent="android:Theme.Holo" />
<style name="AlertDialogItem">
<item name="android:textColor">?android:textColorAlertDialogListItem</item>
</style>
<style name="Library" parent="Theme">
<style name="Playback" parent="android:Theme.Holo">
<item name="android:actionBarStyle">@style/PlaybackActionBar</item>
<item name="android:windowBackground">@android:color/black</item>
</style>
<style name="PlaybackActionBar" parent="android:Widget.Holo.ActionBar">
<item name="android:displayOptions">showTitle|homeAsUp</item>
</style>
<style name="Library" parent="android:Theme.Holo">
<item name="android:actionBarStyle">@style/LibraryActionBar</item>
</style>
<style name="LibraryActionBar" parent="android:Widget.Holo.ActionBar">

5
res/values/untranslatable.xml
View File

@ -22,11 +22,10 @@ THE SOFTWARE.
-->
<resources>
<style name="Dialog" parent="android:Theme.Dialog" />
<style name="Theme" parent="android:Theme" />
<style name="Library" parent="Theme">
<style name="Library" parent="android:Theme">
<item name="android:windowNoTitle">true</item>
</style>
<style name="NoBackground" parent="Theme">
<style name="Playback" parent="android:Theme">
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@null</item>
</style>

8
src/org/kreed/vanilla/FullPlaybackActivity.java
View File

@ -25,6 +25,7 @@ package org.kreed.vanilla;
import android.content.Intent;
import android.content.SharedPreferences;
import android.graphics.Color;
import android.os.Build;
import android.os.Bundle;
import android.os.Message;
import android.text.format.DateUtils;
@ -163,8 +164,6 @@ public class FullPlaybackActivity extends PlaybackActivity
setControlsVisible(settings.getBoolean("visible_controls", true));
setDuration(0);
getWindow().addFlags(0x08000000); // show menu key on ICS
}
@Override
@ -289,7 +288,9 @@ public class FullPlaybackActivity extends PlaybackActivity
@Override
public boolean onCreateOptionsMenu(Menu menu)
{
menu.add(0, MENU_LIBRARY, 0, R.string.library).setIcon(R.drawable.ic_menu_music_library);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
menu.add(0, MENU_LIBRARY, 0, R.string.library).setIcon(R.drawable.ic_menu_music_library);
}
return super.onCreateOptionsMenu(menu);
}
@ -297,6 +298,7 @@ public class FullPlaybackActivity extends PlaybackActivity
public boolean onOptionsItemSelected(MenuItem item)
{
switch (item.getItemId()) {
case android.R.id.home:
case MENU_LIBRARY:
openLibrary(null);
return true;