summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorlinus_lee <llee@cyngn.com>2014-09-19 18:46:07 -0700
committerlinus_lee <llee@cyngn.com>2014-11-20 12:03:03 -0800
commit28b3154d2d8dcfcb801628ac479e13502e4168ee (patch)
tree88cad9ad52b4d200f67f7c08efd8700f44b1f9b5 /res/values
parent6ad31131a033d0481b8a24cdd4260cdb4d5cd543 (diff)
downloadandroid_packages_apps_Eleven-28b3154d2d8dcfcb801628ac479e13502e4168ee.tar.gz
android_packages_apps_Eleven-28b3154d2d8dcfcb801628ac479e13502e4168ee.tar.bz2
android_packages_apps_Eleven-28b3154d2d8dcfcb801628ac479e13502e4168ee.zip
This hooks up the show all part of the search as well as footers
The divider is slightly off - I think to properly fix it, we need to bring in the dividers into the list items and not have the list view handle it. I will add comments to Music-48 to track the divider issue https://cyanogen.atlassian.net/browse/MUSIC-24 Change-Id: I756064154bc4b217a1981ff39bdee7e8000cf911
Diffstat (limited to 'res/values')
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimens.xml8
-rw-r--r--res/values/strings.xml12
-rw-r--r--res/values/styles.xml8
4 files changed, 23 insertions, 8 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml
index aa34581..24072b6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -80,6 +80,7 @@
<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_search_footer_text_color">#ff41a4f4</color>
<color name="list_item_text_color">@color/default_text_color</color>
<color name="list_item_text_color_light">@color/default_text_color_light</color>
<color name="list_item_divider_color">#4c231f20</color>
@@ -90,6 +91,8 @@
<color name="tpi_text_color">#bf3d4049</color>
<color name="tpi_selected_text_color">#bf3d4049</color>
+ <!-- Search Colors -->
+ <color name="search_hint_color">#4cffffff</color>
<!-- Color for the text on the audio player -->
<color name="audio_player_text_color">@color/default_text_color_light</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index af6d700..06189b5 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -31,9 +31,6 @@
<dimen name="overflow_height">30.0dip</dimen>
<dimen name="overflow_width">24.0dip</dimen>
- <!-- List item section header -->
- <dimen name="list_item_header_height">30.0dip</dimen>
-
<!-- List and grid view padding -->
<dimen name="list_preferred_item_padding">10.0dip</dimen>
<dimen name="list_menu_item_padding_right">2.0dip</dimen>
@@ -42,6 +39,7 @@
<dimen name="list_item_padding_top">10.0dip</dimen>
<dimen name="list_item_padding_bottom">10.0dip</dimen>
<dimen name="list_item_header_size">16.0sp</dimen>
+ <dimen name="list_item_footer_size">20.0sp</dimen>
<dimen name="list_item_main_text_size">@dimen/text_size_small</dimen>
<dimen name="list_item_secondary_text_size">@dimen/text_size_micro</dimen>
<dimen name="list_item_queue_text_padding_left">15.0dip</dimen>
@@ -189,4 +187,8 @@
<dimen name="no_results_text_padding_bottom">16.0dip</dimen>
<dimen name="no_reuslts_text_main">20.0sp</dimen>
<dimen name="no_results_text_secondary">14.0sp</dimen>
+
+ <!-- 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>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3356d91..f49af10 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -18,7 +18,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" translatable="false">Music</string>
- <string name="app_name_uppercase" translatable="false">MUSIC</string>
<!-- Page titles -->
<string name="page_recent">Recent</string>
@@ -211,6 +210,17 @@
<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="footer_search_artists">Show all artists</string>
+ <string name="footer_search_albums">Show all albums</string>
+ <string name="footer_search_songs">Show all songs</string>
+ <string name="footer_search_playlists">Show all playlists</string>
+
+ <string name="searchHint">Search Music</string>
+ <string name="search_title_artists">All \"%s\" artists</string>
+ <string name="search_title_albums">All \"%s\" albums</string>
+ <string name="search_title_songs">All \"%s\" songs</string>
+ <string name="search_title_playlists">All \"%s\" playlists</string>
+
<string name="duration_album_mins_only"><xliff:g id="format">%1$dm</xliff:g></string>
<string name="duration_album_hour_mins"><xliff:g id="format">%1$dh %2$dm</xliff:g></string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3e1ec0f..7d11d0f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,8 +30,8 @@
</style>
<style name="ActionBarWidgetTheme" parent="@android:style/Theme.Holo">
- <!-- This is the color of the search text in the action bar -->
- <item name="android:textColorHint">@android:color/white</item>
+ <!-- This is the color of the search text hint in the action bar -->
+ <item name="android:textColorHint">@color/search_hint_color</item>
<item name="android:popupMenuStyle">@style/PopupMenu</item>
<item name="android:dropDownListViewStyle">@style/DropDownListView</item>
<item name="android:textAppearanceSmallPopupMenu">@style/SmallPopupMenu</item>
@@ -46,7 +46,7 @@
<!-- Set the default list view divider color and size -->
<style name="ListView" parent="@android:style/Widget.Holo.ListView">
<item name="android:divider">@color/list_item_divider_color</item>
- <item name="android:dividerHeight">1dp</item>
+ <item name="android:dividerHeight">@dimen/divider_height</item>
</style>
<!-- Sets up the pop up menu backgroudn resource -->
@@ -57,7 +57,7 @@
<!-- Sets up the pop up menu divider color and height -->
<style name="DropDownListView" parent="@android:style/Widget.Holo.ListView.DropDown">
<item name="android:divider">@color/menu_divider_color</item>
- <item name="android:dividerHeight">1dp</item>
+ <item name="android:dividerHeight">@dimen/divider_height</item>
</style>
<!-- Sets up the pop up menu text color and size -->