summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-08-11 15:42:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-08-09 00:40:15 +0000
commit6551b7ef07b4d73c096cbfb22002e080b498cbbb (patch)
treec99b07defc44f522cf51bdf9006c5bc7e139530c /res/values
parent5337aea1536c11e5bfef49a14297fd4649baa3a3 (diff)
parent4e243a2dad3700868035256af1882d7a4fee2385 (diff)
downloadandroid_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.tar.gz
android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.tar.bz2
android_packages_apps_Trebuchet-6551b7ef07b4d73c096cbfb22002e080b498cbbb.zip
Merge "Updating the widget tray" into ub-now-porkchop
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml5
-rw-r--r--res/values/colors.xml3
-rw-r--r--res/values/dimens.xml7
3 files changed, 5 insertions, 10 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f3bfcec61..12fa3cd2b 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -98,11 +98,6 @@
<!-- A spacing override for the icons within a page -->
<attr name="pageLayoutWidthGap" format="dimension" />
<attr name="pageLayoutHeightGap" format="dimension" />
- <!-- The padding of the pages that are dynamically created per page -->
- <attr name="pageLayoutPaddingTop" format="dimension" />
- <attr name="pageLayoutPaddingBottom" format="dimension" />
- <attr name="pageLayoutPaddingLeft" format="dimension" />
- <attr name="pageLayoutPaddingRight" format="dimension" />
<!-- The page indicator for this workspace -->
<attr name="pageIndicator" format="reference" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 27a5b61ee..41f38921f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -36,6 +36,7 @@
<color name="quantum_panel_text_shadow_color">#FFC4C4C4</color>
<color name="folder_items_glow_color">#FFCCCCCC</color>
<color name="outline_color">#FFFFFFFF</color>
-
+ <color name="widget_text_panel">#FF374248</color>
+
<color name="first_run_cling_circle_background_color">#64b1ea</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 8e561cfc0..893d7c0db 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -62,7 +62,7 @@
<dimen name="apps_customize_tab_bar_height">52dp</dimen>
<dimen name="apps_customize_tab_bar_margin_top">0dp</dimen>
<dimen name="app_icon_size">48dp</dimen>
- <dimen name="apps_customize_horizontal_padding">4dp</dimen>
+ <dimen name="apps_customize_horizontal_padding">0dp</dimen>
<!-- The AppsCustomize page indicator -->
<dimen name="apps_customize_page_indicator_height">12dp</dimen>
@@ -89,9 +89,8 @@
<dimen name="app_widget_preview_padding_left">16dp</dimen>
<dimen name="app_widget_preview_padding_right">16dp</dimen>
<dimen name="app_widget_preview_padding_top">32dp</dimen>
- <dimen name="app_widget_preview_label_margin_top">4dp</dimen>
- <dimen name="app_widget_preview_label_margin_left">2dp</dimen>
- <dimen name="app_widget_preview_label_margin_right">2dp</dimen>
+ <dimen name="app_widget_preview_label_vertical_padding">8dp</dimen>
+ <dimen name="app_widget_preview_label_horizontal_padding">8dp</dimen>
<!-- Padding applied to shortcut previews -->
<dimen name="shortcut_preview_padding_left">0dp</dimen>