diff options
author | Renato Mangini <mangini@google.com> | 2014-10-02 10:46:11 -0700 |
---|---|---|
committer | Renato Mangini <mangini@google.com> | 2014-10-02 13:33:27 -0700 |
commit | 6768540171cd815002160bf76dcee1ae57b0fb28 (patch) | |
tree | c87b3c0f20f6f5de4b908ee1197341e9810829df /MusicDemo/src/main/res | |
parent | c9063ac9fb7a4f386d9ac69e0308b21199c7783e (diff) | |
download | demos-6768540171cd815002160bf76dcee1ae57b0fb28.tar.gz |
Updated MusicDemo sample.
Use material icons and colors;
Removed dependence on support libraries;
Added album art cache;
Bug: 17755718
Change-Id: I3085aa3e154393c3b0287783600f7187f7e42c7a
Diffstat (limited to 'MusicDemo/src/main/res')
18 files changed, 9 insertions, 25 deletions
diff --git a/MusicDemo/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/MusicDemo/src/main/res/drawable-hdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 0000000..b4bdbb5 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-hdpi/ic_pause_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/MusicDemo/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 0000000..164385d --- /dev/null +++ b/MusicDemo/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-hdpi/ic_shuffle_white_24dp.png b/MusicDemo/src/main/res/drawable-hdpi/ic_shuffle_white_24dp.png Binary files differnew file mode 100644 index 0000000..3eeb0ef --- /dev/null +++ b/MusicDemo/src/main/res/drawable-hdpi/ic_shuffle_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png b/MusicDemo/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png Binary files differnew file mode 100644 index 0000000..4eaf7ca --- /dev/null +++ b/MusicDemo/src/main/res/drawable-hdpi/ic_skip_next_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png b/MusicDemo/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png Binary files differnew file mode 100644 index 0000000..e59dedb --- /dev/null +++ b/MusicDemo/src/main/res/drawable-hdpi/ic_skip_previous_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/MusicDemo/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 0000000..14b6d17 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/MusicDemo/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 0000000..a55d199 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xhdpi/ic_shuffle_white_24dp.png b/MusicDemo/src/main/res/drawable-xhdpi/ic_shuffle_white_24dp.png Binary files differnew file mode 100644 index 0000000..8ce3a60 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xhdpi/ic_shuffle_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png b/MusicDemo/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png Binary files differnew file mode 100644 index 0000000..f282b92 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xhdpi/ic_skip_next_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png b/MusicDemo/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png Binary files differnew file mode 100644 index 0000000..2522877 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xhdpi/ic_skip_previous_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/MusicDemo/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 0000000..72dfa9f --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/MusicDemo/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 0000000..043acd8 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xxhdpi/ic_shuffle_white_24dp.png b/MusicDemo/src/main/res/drawable-xxhdpi/ic_shuffle_white_24dp.png Binary files differnew file mode 100644 index 0000000..718b6b5 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xxhdpi/ic_shuffle_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png b/MusicDemo/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png Binary files differnew file mode 100644 index 0000000..4fe6088 --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xxhdpi/ic_skip_next_white_24dp.png diff --git a/MusicDemo/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png b/MusicDemo/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png Binary files differnew file mode 100644 index 0000000..2c9310a --- /dev/null +++ b/MusicDemo/src/main/res/drawable-xxhdpi/ic_skip_previous_white_24dp.png diff --git a/MusicDemo/src/main/res/values-v21/styles.xml b/MusicDemo/src/main/res/values-v21/styles.xml index 6169d24..602ce1c 100644 --- a/MusicDemo/src/main/res/values-v21/styles.xml +++ b/MusicDemo/src/main/res/values-v21/styles.xml @@ -16,17 +16,17 @@ --> <resources> - <style name="AppBaseTheme" parent="Theme.AppCompat.Light"> + <style name="AppBaseTheme" parent="android:Theme.Light"> <!-- colorPrimary is used for Notification icon and bottom facet bar icons and overflow actions --> - <item name="android:colorPrimary">@color/red</item> + <item name="android:colorPrimary">#ffff5722</item> <!-- colorPrimaryDark is used for background --> - <item name="android:colorPrimaryDark">#990000</item> + <item name="android:colorPrimaryDark">#ffbf360c</item> <!-- colorAccent is sparingly used for accents, like floating action button highlight, progress on playbar--> - <item name="android:colorAccent">#0000FF</item> + <item name="android:colorAccent">#ffff5722</item> </style> diff --git a/MusicDemo/src/main/res/values/colors.xml b/MusicDemo/src/main/res/values/colors.xml deleted file mode 100644 index 6a5277e..0000000 --- a/MusicDemo/src/main/res/values/colors.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2014 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - <color name="red">#ffff0000</color> -</resources> diff --git a/MusicDemo/src/main/res/values/styles.xml b/MusicDemo/src/main/res/values/styles.xml index 507dc7b..3be59c1 100644 --- a/MusicDemo/src/main/res/values/styles.xml +++ b/MusicDemo/src/main/res/values/styles.xml @@ -16,8 +16,11 @@ --> <resources> - <style name="AppBaseTheme" parent="Theme.AppCompat.Light"></style> - <style name="AppTheme" parent="AppBaseTheme"></style> + <style name="AppTheme" parent="AppBaseTheme"> + </style> + + <style name="AppBaseTheme" parent="android:Theme.Light"> + </style> </resources>
\ No newline at end of file |