diff options
author | linus_lee <llee@cyngn.com> | 2014-08-28 19:43:43 -0700 |
---|---|---|
committer | linus_lee <llee@cyngn.com> | 2014-11-20 11:58:47 -0800 |
commit | 08276a046ece9c2d25ee5db858bce822bfb0a292 (patch) | |
tree | bb676f1fe4bc7c5dec7c2d17fac7540dfa2ace27 /res/values | |
parent | ec7eb2e4ef7d143e49998ed88753d7c79a662f2f (diff) | |
download | android_packages_apps_Eleven-08276a046ece9c2d25ee5db858bce822bfb0a292.tar.gz android_packages_apps_Eleven-08276a046ece9c2d25ee5db858bce822bfb0a292.tar.bz2 android_packages_apps_Eleven-08276a046ece9c2d25ee5db858bce822bfb0a292.zip |
Eleven: Add circular progress bar logic and hook into main view and queue view
This hooks up most of the circular progress bar logic but is pending design redlines
to fill in the rest of the parts
Change-Id: Ibeb0c724aae7ad8ddf6b216ce7a8b73464112c0e
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/colors.xml | 9 | ||||
-rw-r--r-- | res/values/dimens.xml | 48 | ||||
-rw-r--r-- | res/values/styles.xml | 1 | ||||
-rw-r--r-- | res/values/values.xml | 6 |
4 files changed, 43 insertions, 21 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index ee6fd2f..db7726b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -66,9 +66,6 @@ <color name="bottom_action_bar_text_color">@color/white</color> - <!-- Color for the audio player fragment text --> - <color name="audio_player_text_color">@color/default_text_color</color> - <!-- Color for the pop up menu --> <color name="menu_divider_color">#4ca19d9e</color> <color name="menu_text_color">@color/white</color> @@ -85,4 +82,10 @@ <color name="tpi_selected_text_color">#bf3d4049</color> + <!-- Color for the text on the audio player --> + <color name="audio_player_text_color">#bfffffff</color> + + <!-- Color for the Progress bar --> + <color name="circular_progress_bar_background">#bfababab</color> + <color name="circular_progress_bar">#ffffffff</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 9eb4cb0..0e703ad 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -86,17 +86,24 @@ <dimen name="profile_indicator_height">5.0dip</dimen> <dimen name="profile_label_padding">16.0dip</dimen> - <!-- Audio player --> - <dimen name="audio_player_header_height">60.0dip</dimen> - <dimen name="audio_player_header_padding_left">16.0dip</dimen> - <dimen name="audio_player_header_padding_right">16.0dip</dimen> - <dimen name="audio_player_switch_padding">10.0dip</dimen> - <dimen name="audio_player_time_width">52.0dip</dimen> - <dimen name="audio_player_seek_bar_margin_bottom">2.0dip</dimen> - <dimen name="audio_player_controls_end_button_width">50.0dip</dimen> - <dimen name="audio_player_controls_end_button_height">50.0dip</dimen> - <dimen name="audio_player_controls_main_button_width">58.0dip</dimen> - <dimen name="audio_player_controls_main_button_height">58.0dip</dimen> + <!-- Audio player Buttons (play/pause/shuffle/repeat/next/previous)--> + <dimen name="audio_player_controls_end_button_width">30.0dip</dimen> + <dimen name="audio_player_controls_end_button_height">30.0dip</dimen> + <dimen name="audio_player_controls_main_button_width">80.0dip</dimen> + <dimen name="audio_player_controls_main_button_height">80.0dip</dimen> + <dimen name="audio_player_controls_top_button_width">26.0dip</dimen> + <dimen name="audio_player_controls_top_button_height">30.0dip</dimen> + <dimen name="audio_player_controls_side_width">83.0dip</dimen> + <dimen name="audio_player_control_padding_top">26.0dip</dimen> + + <!-- Audio player track text settings--> + <dimen name="audio_player_track_name_padding_side">36.0dip</dimen> + <dimen name="audio_player_header_padding_bottom">15.0dip</dimen> + <dimen name="audio_player_track_text_size">14sp</dimen> + + <!-- Audio player time text settings--> + <dimen name="audio_player_time_text_padding">6.0dip</dimen> + <dimen name="audio_player_time_text_size">12sp</dimen> <!-- App Widgets --> <dimen name="app_widget_large_min_width">250.0dip</dimen> @@ -131,13 +138,18 @@ <dimen name="color_scheme_dialog_row_padding">8.0dip</dimen> <!-- Sliding Panel --> - <dimen name="sliding_panel_indicator_height">25.0dip</dimen> + <dimen name="sliding_panel_indicator_height">26.0dip</dimen> + <dimen name="sliding_panel_shadow_height">0.0dip</dimen> <!-- Header Bar --> - <dimen name="header_bar_up_width">50.0dip</dimen> - <dimen name="header_bar_up_height">50.0dip</dimen> + <dimen name="header_bar_up_width">30.0dip</dimen> + <dimen name="header_bar_up_height">30.0dip</dimen> <dimen name="header_bar_menu_button_width">30.0dip</dimen> - <dimen name="header_bar_menu_button_height">50.0dip</dimen> + <dimen name="header_bar_menu_button_height">30.0dip</dimen> + <dimen name="header_bar_custom_button_width">30.0dip</dimen> + <dimen name="header_bar_custom_button_height">30.0dip</dimen> + <dimen name="header_bar_button_padding_small">5.0dip</dimen> + <dimen name="header_bar_button_padding_large">10.0dip</dimen> <!-- Title Page Indicator Settings --> <dimen name="tpi_height">50dp</dimen> @@ -145,6 +157,8 @@ <dimen name="tpi_footer_indicator_height">6dp</dimen> <dimen name="tpi_text_size">16sp</dimen> - <dimen name="songlist_control_button_width">50.0dip</dimen> - <dimen name="songlist_control_button_height">50.0dip</dimen> + <dimen name="list_item_progress_width">45.0dip</dimen> + <dimen name="list_item_progress_height">45.0dip</dimen> + <dimen name="list_item_progress_padding_left">10.0dip</dimen> + <dimen name="list_item_progress_padding_right">17.0dip</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 95a1307..df318b8 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -89,7 +89,6 @@ <item name="android:textColor">@color/list_item_text_color</item> <item name="android:textSize">@dimen/list_item_main_text_size</item> <item name="android:textStyle">bold</item> - <item name="android:singleLine">true</item> <item name="android:ellipsize">end</item> </style> diff --git a/res/values/values.xml b/res/values/values.xml new file mode 100644 index 0000000..dfb892a --- /dev/null +++ b/res/values/values.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <!-- Circular Progress Bar Sizes --> + <item format="float" type="dimen" name="circular_progress_bar_inner_radius_ratio">3</item> + <item format="float" type="dimen" name="circular_progress_bar_thickness_ratio">10</item> +</resources>
\ No newline at end of file |