diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2012-09-13 21:20:45 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2012-09-13 21:20:45 -0700 |
| commit | d0e7ff24e162532daf90176f21059c06ae0f9e84 (patch) | |
| tree | bd448785d4ecff9014a0aef4ed1b36ce4c3932d3 /subsonic-android/res | |
| parent | 75a688847ca797905106d95bf6f41660c6ed650b (diff) | |
| download | dsub-d0e7ff24e162532daf90176f21059c06ae0f9e84.tar.gz dsub-d0e7ff24e162532daf90176f21059c06ae0f9e84.tar.bz2 dsub-d0e7ff24e162532daf90176f21059c06ae0f9e84.zip | |
Finished removing AlbumActivities bottom buttons and integrate them into the Action Bar
Diffstat (limited to 'subsonic-android/res')
| -rw-r--r-- | subsonic-android/res/layout/select_album.xml | 48 | ||||
| -rw-r--r-- | subsonic-android/res/menu/select_album.xml | 18 | ||||
| -rw-r--r-- | subsonic-android/res/values/strings.xml | 4 |
3 files changed, 20 insertions, 50 deletions
diff --git a/subsonic-android/res/layout/select_album.xml b/subsonic-android/res/layout/select_album.xml index 59860e28..a5802246 100644 --- a/subsonic-android/res/layout/select_album.xml +++ b/subsonic-android/res/layout/select_album.xml @@ -26,54 +26,6 @@ android:layout_weight="1.0"
android:fastScrollEnabled="true"
/>
-
- <LinearLayout android:orientation="horizontal"
- android:layout_marginTop="6dp"
- android:layout_marginBottom="3dp"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content">
-
- <Button android:id="@+id/select_album_pin"
- android:text="@string/common.pin"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="6dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
-
- <Button android:id="@+id/select_album_unpin"
- android:text="@string/common.unpin"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="3dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
-
- <Button android:id="@+id/select_album_delete"
- android:text="@string/common.delete"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="6dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:visibility="gone"/>
-
- <Button android:id="@+id/select_album_play_last"
- android:text="@string/common.play_last"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- android:layout_marginLeft="3dp"
- android:layout_marginRight="6dp"
- android:layout_weight="1"
- android:layout_width="0dp"
- android:layout_height="fill_parent"/>
-
- </LinearLayout>
<include layout="@layout/button_bar"/>
diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml index b725469a..fe6e8eba 100644 --- a/subsonic-android/res/menu/select_album.xml +++ b/subsonic-android/res/menu/select_album.xml @@ -23,6 +23,24 @@ android:icon="@drawable/action_select" android:title="@string/menu.select" android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_cache" + android:icon="@drawable/action_save" + android:title="@string/common.pin" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_delete" + android:icon="@drawable/action_remove_all" + android:title="@string/common.delete" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_play_last" + android:icon="@drawable/action_play_all" + android:title="@string/menu.play_last" + android:showAsAction="ifRoom|withText"/> <item android:id="@+id/menu_help" diff --git a/subsonic-android/res/values/strings.xml b/subsonic-android/res/values/strings.xml index a2a9df56..b183c95c 100644 --- a/subsonic-android/res/values/strings.xml +++ b/subsonic-android/res/values/strings.xml @@ -9,8 +9,7 @@ <string name="common.play_shuffled">Play shuffled</string>
<string name="common.play_next">Play next</string>
<string name="common.play_last">Play last</string>
- <string name="common.pin">Pin</string>
- <string name="common.unpin">Unpin</string>
+ <string name="common.pin">Cache</string>
<string name="common.delete">Delete</string>
<string name="button_bar.home">DSub home</string>
@@ -38,6 +37,7 @@ <string name="menu.refresh">Refresh</string>
<string name="menu.select">Select All</string>
<string name="menu.play">Play</string>
+ <string name="menu.play_last">Play Last</string>
<string name="menu.exit">Exit</string>
<string name="menu.settings">Settings</string>
<string name="menu.help">Help</string>
|