summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorlinus_lee <llee@cyngn.com>2014-09-10 18:01:50 -0700
committerlinus_lee <llee@cyngn.com>2014-11-20 12:03:03 -0800
commit1142f32db0658647186e474e4da32640643647bc (patch)
treeeed92461dc71a69b1bc8a5caa0448b5cf68550c6 /res
parent45fbb7b165bd4bd99f2e3a8b0d4dad2298ac5cd7 (diff)
downloadandroid_packages_apps_Eleven-1142f32db0658647186e474e4da32640643647bc.tar.gz
android_packages_apps_Eleven-1142f32db0658647186e474e4da32640643647bc.tar.bz2
android_packages_apps_Eleven-1142f32db0658647186e474e4da32640643647bc.zip
Eleven: Add Top Tracks smart playlist and rework some look and feel
https://cyanogen.atlassian.net/browse/MUSIC-35 https://cyanogen.atlassian.net/browse/MUSIC-29 Change-Id: I3b262e7c0b20e15dcd1ce19f39f26dd6cc6306a2
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/gray_circle.pngbin0 -> 529 bytes
-rw-r--r--res/drawable-mdpi/gray_circle.pngbin0 -> 383 bytes
-rw-r--r--res/drawable-xhdpi/gray_circle.pngbin0 -> 633 bytes
-rw-r--r--res/drawable-xxhdpi/empty_playlist_icon.pngbin0 -> 695 bytes
-rw-r--r--res/drawable-xxhdpi/gray_circle.pngbin0 -> 917 bytes
-rw-r--r--res/drawable-xxhdpi/recent_icon.pngbin0 -> 1438 bytes
-rw-r--r--res/drawable-xxhdpi/top_tracks_icon.pngbin0 -> 972 bytes
-rw-r--r--res/layout/list_item_top_tracks.xml81
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/dimens.xml1
-rw-r--r--res/values/donottranslate.xml2
-rw-r--r--res/values/strings.xml3
12 files changed, 86 insertions, 2 deletions
diff --git a/res/drawable-hdpi/gray_circle.png b/res/drawable-hdpi/gray_circle.png
new file mode 100644
index 0000000..1dc80c3
--- /dev/null
+++ b/res/drawable-hdpi/gray_circle.png
Binary files differ
diff --git a/res/drawable-mdpi/gray_circle.png b/res/drawable-mdpi/gray_circle.png
new file mode 100644
index 0000000..2060b47
--- /dev/null
+++ b/res/drawable-mdpi/gray_circle.png
Binary files differ
diff --git a/res/drawable-xhdpi/gray_circle.png b/res/drawable-xhdpi/gray_circle.png
new file mode 100644
index 0000000..e1f13a7
--- /dev/null
+++ b/res/drawable-xhdpi/gray_circle.png
Binary files differ
diff --git a/res/drawable-xxhdpi/empty_playlist_icon.png b/res/drawable-xxhdpi/empty_playlist_icon.png
new file mode 100644
index 0000000..0623697
--- /dev/null
+++ b/res/drawable-xxhdpi/empty_playlist_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/gray_circle.png b/res/drawable-xxhdpi/gray_circle.png
new file mode 100644
index 0000000..c66c198
--- /dev/null
+++ b/res/drawable-xxhdpi/gray_circle.png
Binary files differ
diff --git a/res/drawable-xxhdpi/recent_icon.png b/res/drawable-xxhdpi/recent_icon.png
new file mode 100644
index 0000000..dbe5daf
--- /dev/null
+++ b/res/drawable-xxhdpi/recent_icon.png
Binary files differ
diff --git a/res/drawable-xxhdpi/top_tracks_icon.png b/res/drawable-xxhdpi/top_tracks_icon.png
new file mode 100644
index 0000000..da4e919
--- /dev/null
+++ b/res/drawable-xxhdpi/top_tracks_icon.png
Binary files differ
diff --git a/res/layout/list_item_top_tracks.xml b/res/layout/list_item_top_tracks.xml
new file mode 100644
index 0000000..2b4a795
--- /dev/null
+++ b/res/layout/list_item_top_tracks.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2012 Andrew Neal
+
+ 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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/item_normal_height"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/item_normal_height"
+ android:paddingTop="@dimen/list_item_padding_top"
+ android:paddingBottom="@dimen/list_item_padding_bottom"
+ tools:ignore="ContentDescription" >
+
+ <FrameLayout
+ android:id="@+id/position_contanier"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_alignParentLeft="true" >
+ <ImageView
+ android:layout_width="@dimen/list_item_top_track_image_size"
+ android:layout_height="@dimen/list_item_top_track_image_size"
+ android:layout_gravity="center"
+ android:scaleType="centerCrop"
+ android:src="@drawable/gray_circle" />
+ <TextView
+ android:id="@+id/position_number"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:textStyle="bold"
+ android:textSize="@dimen/text_size_small"
+ android:textColor="@color/white" />
+ </FrameLayout>
+
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="@dimen/list_item_image_height"
+ android:layout_toRightOf="@+id/position_contanier"
+ android:layout_toLeftOf="@+id/line_one_right"
+ android:gravity="center_vertical"
+ android:minHeight="@dimen/item_normal_height"
+ android:paddingLeft="@dimen/list_preferred_item_padding" >
+
+ <TextView
+ android:id="@+id/line_one"
+ style="@style/ListItemMainText.Single"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
+ <TextView
+ android:id="@+id/line_two"
+ style="@style/ListItemSecondaryText.Single"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/line_one" />
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/line_one_right"
+ style="@style/ListItemSecondaryText.Single"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true" />
+
+</RelativeLayout> \ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 1cc9430..6c18a71 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -74,6 +74,7 @@
<color name="menu_text_color">@color/white</color>
<!-- List view related colors -->
+ <color name="smart_playlist_item_background">#1931353f</color>
<color name="list_item_background">#4ce4e9ed</color>
<color name="list_item_header_text_color">#ff3d4049</color>
<color name="list_item_text_color">@color/default_text_color</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7fd95f0..3a766d1 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -58,6 +58,7 @@
<dimen name="item_normal_height">70.0dip</dimen>
<dimen name="list_item_image_height">50.0dip</dimen>
<dimen name="list_item_image_width">50.0dip</dimen>
+ <dimen name="list_item_top_track_image_size">26.0dip</dimen>
<!-- Bottom Action Bar -->
<dimen name="bottom_action_bar_height">50.0dip</dimen>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
index d80c169..e5841ed 100644
--- a/res/values/donottranslate.xml
+++ b/res/values/donottranslate.xml
@@ -19,5 +19,7 @@
<string name="durationformatshort" translatable="false"><xliff:g id="format">%2$d:%3$02d</xliff:g></string>
<!-- Do not translate. Duration format for duration >= 1 hour -->
<string name="durationformatlong" translatable="false"><xliff:g id="format">%1$d:%2$02d:%3$02d</xliff:g></string>
+ <!-- Do not translate. This provides a separator for two strings -->
+ <string name="combine_two_strings" translatable="false">%1$s | %2$s</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84ac14c..ad3a907 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -79,6 +79,7 @@
<string name="playlist_favorite">Favorite</string>
<string name="playlist_favorites">Favorites</string>
<string name="playlist_last_added">Last added</string>
+ <string name="playlist_top_tracks">My Top Tracks</string>
<!-- AlertDialog items -->
<string name="new_playlist">New playlist</string>
@@ -201,8 +202,6 @@
<string name="header_n_albums"><xliff:g id="number">%d</xliff:g> Albums</string>
<string name="header_5_plus_albums">5+ Albums</string>
- <string name="combine_two_strings">%1$s | %2$s</string>
-
<string name="duration_mins"><xliff:g id="format">%3$dm %4$ds</xliff:g></string>
<string name="duration_hours"><xliff:g id="format">%2$dh %3$dm %4$ds</xliff:g></string>
<string name="duration_days"><xliff:g id="format">%1$dd %2$dd %3$dm %4$ds</xliff:g></string>