diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-05-29 17:38:15 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-05-29 17:38:15 -0700 |
| commit | 7111cf31fefa5136c62f39befa9fb4ee214d47ca (patch) | |
| tree | e31e164e33efb85d8d604ce501860dc953f083f6 /app/src/main/res/values | |
| parent | cfa23075eb3c446fd22a67d782252781648e5dab (diff) | |
| parent | 1697ead7480395a4850e2cfc06d2af2d58910d5a (diff) | |
| download | dsub-7111cf31fefa5136c62f39befa9fb4ee214d47ca.tar.gz dsub-7111cf31fefa5136c62f39befa9fb4ee214d47ca.tar.bz2 dsub-7111cf31fefa5136c62f39befa9fb4ee214d47ca.zip | |
Merge branch 'RecyclerView' into SlideUpPanel2
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/strings.xml | 4 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e6e19b4c..bb0a997b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -236,7 +236,9 @@ <string name="starring_content_starred">Starred \"%s\"</string> <string name="starring_content_unstarred">Unstarred \"%s\"</string> <string name="starring_content_error">Failed to update \"%s\", please try later.</string> - + + <string name="playlist.mine">My Playlists</string> + <string name="playlist.shared">Shared Playlists</string> <string name="playlist_error">Failed to grab list of playlists</string> <string name="updated_playlist">Added %1$s songs to \"%2$s\"</string> <string name="updated_playlist_error">Failed to update \"%s\", please try later.</string> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 061cfae7..c4a53b99 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <style name="BasicButton"> - <item name="android:background">@drawable/abc_item_background_holo_light</item> + <item name="android:background">?attr/selectableItemBackground</item> </style> <style name="MoreButton" parent="BasicButton"> |