summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorlinus_lee <llee@cyngn.com>2014-11-26 18:20:29 -0800
committerlinus_lee <llee@cyngn.com>2014-12-09 12:02:08 -0800
commitf199f983c9a5e2f4434b85273d1da0d609c33228 (patch)
tree1a790aff63fe5362bac927b592507b1901030513 /res
parentcb83a720c4c358eb7657298dbcf940d029e5af1c (diff)
downloadandroid_packages_apps_Eleven-f199f983c9a5e2f4434b85273d1da0d609c33228.tar.gz
android_packages_apps_Eleven-f199f983c9a5e2f4434b85273d1da0d609c33228.tar.bz2
android_packages_apps_Eleven-f199f983c9a5e2f4434b85273d1da0d609c33228.zip
Eleven: Switch default artist and album to a more colorful version
Also fixed a bug where playlist worker tasks were running more than necessary Removed the picker to fetch images from internet because last.fm is removed for now Change-Id: Ice438ac650d8b7be0c275f8270af13086e6568d6
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/default_artist.pngbin4783 -> 0 bytes
-rw-r--r--res/drawable-hdpi/default_artwork_sm.pngbin18293 -> 0 bytes
-rw-r--r--res/drawable-hdpi/default_playlist.pngbin3823 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_album.pngbin0 -> 970 bytes
-rw-r--r--res/drawable-hdpi/ic_album_lg.pngbin0 -> 3416 bytes
-rw-r--r--res/drawable-hdpi/ic_artist.pngbin0 -> 1377 bytes
-rw-r--r--res/drawable-hdpi/ic_artist_lg.pngbin0 -> 4536 bytes
-rw-r--r--res/drawable-hdpi/ic_playlist.pngbin0 -> 1027 bytes
-rw-r--r--res/drawable-hdpi/ic_playlist_lg.pngbin0 -> 3345 bytes
-rw-r--r--res/drawable-mdpi/default_artist.pngbin3191 -> 0 bytes
-rw-r--r--res/drawable-mdpi/default_artwork_sm.pngbin17200 -> 0 bytes
-rw-r--r--res/drawable-mdpi/default_playlist.pngbin2380 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_album.pngbin0 -> 721 bytes
-rw-r--r--res/drawable-mdpi/ic_album_lg.pngbin0 -> 2016 bytes
-rw-r--r--res/drawable-mdpi/ic_artist.pngbin0 -> 962 bytes
-rw-r--r--res/drawable-mdpi/ic_artist_lg.pngbin0 -> 2855 bytes
-rw-r--r--res/drawable-mdpi/ic_playlist.pngbin0 -> 730 bytes
-rw-r--r--res/drawable-mdpi/ic_playlist_lg.pngbin0 -> 2059 bytes
-rw-r--r--res/drawable-xhdpi/default_artist.pngbin6742 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/default_artwork_sm.pngbin19232 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/default_playlist.pngbin5404 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_album.pngbin0 -> 1300 bytes
-rw-r--r--res/drawable-xhdpi/ic_album_lg.pngbin0 -> 4967 bytes
-rw-r--r--res/drawable-xhdpi/ic_artist.pngbin0 -> 1863 bytes
-rw-r--r--res/drawable-xhdpi/ic_artist_lg.pngbin0 -> 6494 bytes
-rw-r--r--res/drawable-xhdpi/ic_playlist.pngbin0 -> 1322 bytes
-rw-r--r--res/drawable-xhdpi/ic_playlist_lg.pngbin0 -> 4891 bytes
-rw-r--r--res/drawable-xxhdpi/default_artist.pngbin11197 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/default_artwork_sm.pngbin4503 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/default_playlist.pngbin8917 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_album.pngbin0 -> 2017 bytes
-rw-r--r--res/drawable-xxhdpi/ic_album_lg.pngbin0 -> 11010 bytes
-rw-r--r--res/drawable-xxhdpi/ic_artist.pngbin0 -> 2819 bytes
-rw-r--r--res/drawable-xxhdpi/ic_artist_lg.pngbin0 -> 12047 bytes
-rw-r--r--res/drawable-xxhdpi/ic_playlist.pngbin0 -> 2056 bytes
-rw-r--r--res/drawable-xxhdpi/ic_playlist_lg.pngbin0 -> 9381 bytes
-rw-r--r--res/layout-v16/notification_template_expanded_base.xml1
-rw-r--r--res/layout/app_widget_large.xml1
-rw-r--r--res/layout/app_widget_large_alternate.xml1
-rw-r--r--res/layout/app_widget_small.xml1
-rw-r--r--res/layout/list_item_common.xml2
-rw-r--r--res/layout/notification_template_base.xml1
-rw-r--r--res/values/colors.xml14
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/values/donottranslate.xml2
-rw-r--r--res/values/strings.xml1
46 files changed, 19 insertions, 7 deletions
diff --git a/res/drawable-hdpi/default_artist.png b/res/drawable-hdpi/default_artist.png
deleted file mode 100644
index cc2fc45..0000000
--- a/res/drawable-hdpi/default_artist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/default_artwork_sm.png b/res/drawable-hdpi/default_artwork_sm.png
deleted file mode 100644
index e5e1f0e..0000000
--- a/res/drawable-hdpi/default_artwork_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/default_playlist.png b/res/drawable-hdpi/default_playlist.png
deleted file mode 100644
index d906e25..0000000
--- a/res/drawable-hdpi/default_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_album.png b/res/drawable-hdpi/ic_album.png
new file mode 100644
index 0000000..3d2c389
--- /dev/null
+++ b/res/drawable-hdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_album_lg.png b/res/drawable-hdpi/ic_album_lg.png
new file mode 100644
index 0000000..989d0b6
--- /dev/null
+++ b/res/drawable-hdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_artist.png b/res/drawable-hdpi/ic_artist.png
new file mode 100644
index 0000000..b839a8b
--- /dev/null
+++ b/res/drawable-hdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_artist_lg.png b/res/drawable-hdpi/ic_artist_lg.png
new file mode 100644
index 0000000..ef38a96
--- /dev/null
+++ b/res/drawable-hdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_playlist.png b/res/drawable-hdpi/ic_playlist.png
new file mode 100644
index 0000000..74876fa
--- /dev/null
+++ b/res/drawable-hdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_playlist_lg.png b/res/drawable-hdpi/ic_playlist_lg.png
new file mode 100644
index 0000000..bb9a734
--- /dev/null
+++ b/res/drawable-hdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/drawable-mdpi/default_artist.png b/res/drawable-mdpi/default_artist.png
deleted file mode 100644
index 24c2c43..0000000
--- a/res/drawable-mdpi/default_artist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/default_artwork_sm.png b/res/drawable-mdpi/default_artwork_sm.png
deleted file mode 100644
index fbe603a..0000000
--- a/res/drawable-mdpi/default_artwork_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/default_playlist.png b/res/drawable-mdpi/default_playlist.png
deleted file mode 100644
index 3bacabc..0000000
--- a/res/drawable-mdpi/default_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_album.png b/res/drawable-mdpi/ic_album.png
new file mode 100644
index 0000000..7ebc0e0
--- /dev/null
+++ b/res/drawable-mdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_album_lg.png b/res/drawable-mdpi/ic_album_lg.png
new file mode 100644
index 0000000..a5c40a3
--- /dev/null
+++ b/res/drawable-mdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_artist.png b/res/drawable-mdpi/ic_artist.png
new file mode 100644
index 0000000..d1bf6cb
--- /dev/null
+++ b/res/drawable-mdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_artist_lg.png b/res/drawable-mdpi/ic_artist_lg.png
new file mode 100644
index 0000000..3b8f6cf
--- /dev/null
+++ b/res/drawable-mdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_playlist.png b/res/drawable-mdpi/ic_playlist.png
new file mode 100644
index 0000000..16c2c83
--- /dev/null
+++ b/res/drawable-mdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_playlist_lg.png b/res/drawable-mdpi/ic_playlist_lg.png
new file mode 100644
index 0000000..aea793b
--- /dev/null
+++ b/res/drawable-mdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/drawable-xhdpi/default_artist.png b/res/drawable-xhdpi/default_artist.png
deleted file mode 100644
index f93deac..0000000
--- a/res/drawable-xhdpi/default_artist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/default_artwork_sm.png b/res/drawable-xhdpi/default_artwork_sm.png
deleted file mode 100644
index 6df4dba..0000000
--- a/res/drawable-xhdpi/default_artwork_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/default_playlist.png b/res/drawable-xhdpi/default_playlist.png
deleted file mode 100644
index 627bdc0..0000000
--- a/res/drawable-xhdpi/default_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_album.png b/res/drawable-xhdpi/ic_album.png
new file mode 100644
index 0000000..7e259f7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_album_lg.png b/res/drawable-xhdpi/ic_album_lg.png
new file mode 100644
index 0000000..68cb298
--- /dev/null
+++ b/res/drawable-xhdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_artist.png b/res/drawable-xhdpi/ic_artist.png
new file mode 100644
index 0000000..43a3e43
--- /dev/null
+++ b/res/drawable-xhdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_artist_lg.png b/res/drawable-xhdpi/ic_artist_lg.png
new file mode 100644
index 0000000..849957e
--- /dev/null
+++ b/res/drawable-xhdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_playlist.png b/res/drawable-xhdpi/ic_playlist.png
new file mode 100644
index 0000000..22defcc
--- /dev/null
+++ b/res/drawable-xhdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_playlist_lg.png b/res/drawable-xhdpi/ic_playlist_lg.png
new file mode 100644
index 0000000..d1ccedd
--- /dev/null
+++ b/res/drawable-xhdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/default_artist.png b/res/drawable-xxhdpi/default_artist.png
deleted file mode 100644
index c117eb3..0000000
--- a/res/drawable-xxhdpi/default_artist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/default_artwork_sm.png b/res/drawable-xxhdpi/default_artwork_sm.png
deleted file mode 100644
index 19b0e50..0000000
--- a/res/drawable-xxhdpi/default_artwork_sm.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/default_playlist.png b/res/drawable-xxhdpi/default_playlist.png
deleted file mode 100644
index df873ed..0000000
--- a/res/drawable-xxhdpi/default_playlist.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_album.png b/res/drawable-xxhdpi/ic_album.png
new file mode 100644
index 0000000..a87c660
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_album.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_album_lg.png b/res/drawable-xxhdpi/ic_album_lg.png
new file mode 100644
index 0000000..022b098
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_album_lg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_artist.png b/res/drawable-xxhdpi/ic_artist.png
new file mode 100644
index 0000000..6dc97ef
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_artist.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_artist_lg.png b/res/drawable-xxhdpi/ic_artist_lg.png
new file mode 100644
index 0000000..b3eb2fd
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_artist_lg.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_playlist.png b/res/drawable-xxhdpi/ic_playlist.png
new file mode 100644
index 0000000..76280f9
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_playlist.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_playlist_lg.png b/res/drawable-xxhdpi/ic_playlist_lg.png
new file mode 100644
index 0000000..c082480
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_playlist_lg.png
Binary files differ
diff --git a/res/layout-v16/notification_template_expanded_base.xml b/res/layout-v16/notification_template_expanded_base.xml
index ba1f807..2b452ae 100644
--- a/res/layout-v16/notification_template_expanded_base.xml
+++ b/res/layout-v16/notification_template_expanded_base.xml
@@ -28,7 +28,6 @@
android:layout_height="@dimen/notification_expanded_height"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
- android:background="@drawable/default_artwork"
android:scaleType="fitXY" />
<LinearLayout
diff --git a/res/layout/app_widget_large.xml b/res/layout/app_widget_large.xml
index 1bf1f2d..65e528a 100644
--- a/res/layout/app_widget_large.xml
+++ b/res/layout/app_widget_large.xml
@@ -29,7 +29,6 @@
android:layout_height="@dimen/notification_expanded_height"
android:layout_rowSpan="3"
android:layout_marginBottom="@dimen/app_widget_bottom_margin"
- android:background="@drawable/default_artwork_sm"
android:scaleType="fitXY" />
<LinearLayout
diff --git a/res/layout/app_widget_large_alternate.xml b/res/layout/app_widget_large_alternate.xml
index df93316..6accbcf 100644
--- a/res/layout/app_widget_large_alternate.xml
+++ b/res/layout/app_widget_large_alternate.xml
@@ -27,7 +27,6 @@
android:id="@+id/app_widget_large_alternate_image"
android:layout_width="@dimen/app_widget_large_alternate_artwork_size"
android:layout_height="@dimen/app_widget_large_alternate_artwork_size"
- android:background="@drawable/default_artwork_sm"
android:scaleType="fitXY" />
<LinearLayout
diff --git a/res/layout/app_widget_small.xml b/res/layout/app_widget_small.xml
index 0539fd9..955f837 100644
--- a/res/layout/app_widget_small.xml
+++ b/res/layout/app_widget_small.xml
@@ -29,7 +29,6 @@
android:id="@+id/app_widget_small_image"
android:layout_width="@dimen/app_widget_small_artwork_size"
android:layout_height="@dimen/app_widget_small_artwork_size"
- android:background="@drawable/default_artwork_sm"
android:contentDescription="@null"
android:scaleType="centerInside" />
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index b4ef0c7..0bf966f 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -1,5 +1,5 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <com.cyngn.eleven.widgets.SquareImageView
+ <ImageView
android:id="@+id/image"
android:layout_width="@dimen/list_item_image_width"
android:layout_height="@dimen/list_item_image_height"
diff --git a/res/layout/notification_template_base.xml b/res/layout/notification_template_base.xml
index 5af6514..2fc66ff 100644
--- a/res/layout/notification_template_base.xml
+++ b/res/layout/notification_template_base.xml
@@ -27,7 +27,6 @@
android:id="@+id/notification_base_image"
android:layout_width="@dimen/notification_big_icon_width"
android:layout_height="@dimen/notification_big_icon_height"
- android:background="@drawable/default_artwork"
android:gravity="center" />
<LinearLayout
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 92b6fb0..8a373ee 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -115,4 +115,18 @@
<!-- Background Lyrics Color -->
<color name="lyrics_background_color">#b2000000</color>
+
+ <!-- Letter tile colors -->
+ <color name="letter_tile_default_color">#cccccc</color>
+ <color name="letter_tile_font_color">#ffffff</color>
+ <array name="letter_tile_colors">
+ <item>#9237A2</item>
+ <item>#4B498C</item>
+ <item>#4E5BA7</item>
+ <item>#41A4F4</item>
+ <item>#10887C</item>
+ <item>#689144</item>
+ <item>#B9BF45</item>
+ <item>#757578</item>
+ </array>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index cd80a8c..268113e 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -207,4 +207,6 @@
<!-- General consensus is to leave dividers at 1px instead of having different
partial scaled up values for different resolutions -->
<dimen name="divider_height">1px</dimen>
+
+ <item name="letter_to_tile_ratio" type="dimen">53%</item>
</resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index e5841ed..a763ec4 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -22,4 +22,6 @@
<!-- Do not translate. This provides a separator for two strings -->
<string name="combine_two_strings" translatable="false">%1$s | %2$s</string>
+ <!-- Font family used when drawing letters for letter tile avatars. -->
+ <string name="letter_tile_letter_font_family" translatable="false">sans-serif-light</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b7b550c..6f2dd84 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -201,5 +201,4 @@
<string name="search_title_playlists">All \"%s\" playlists</string>
<string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
-
</resources>