diff options
| author | Mark Brophy <mbrophy@google.com> | 2014-08-11 12:42:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-08 18:15:47 +0000 |
| commit | 5337aea1536c11e5bfef49a14297fd4649baa3a3 (patch) | |
| tree | c7ed85e7d1f17182475da9d336dae9c4257c221a /res/values | |
| parent | d3ad9828d15f9c8fa435f2d59cd5a18e9ebee100 (diff) | |
| parent | fd0f02ce428880e7dc59ebc94717c3e25d22cbb7 (diff) | |
| download | android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.tar.gz android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.tar.bz2 android_packages_apps_Trebuchet-5337aea1536c11e5bfef49a14297fd4649baa3a3.zip | |
Merge "Revert "Updating the widget tray"" into ub-now-porkchop
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | res/values/colors.xml | 3 | ||||
| -rw-r--r-- | res/values/dimens.xml | 7 |
3 files changed, 10 insertions, 5 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 12fa3cd2b..f3bfcec61 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -98,6 +98,11 @@ <!-- 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 41f38921f..27a5b61ee 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -36,7 +36,6 @@ <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 893d7c0db..8e561cfc0 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">0dp</dimen> + <dimen name="apps_customize_horizontal_padding">4dp</dimen> <!-- The AppsCustomize page indicator --> <dimen name="apps_customize_page_indicator_height">12dp</dimen> @@ -89,8 +89,9 @@ <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_vertical_padding">8dp</dimen> - <dimen name="app_widget_preview_label_horizontal_padding">8dp</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> <!-- Padding applied to shortcut previews --> <dimen name="shortcut_preview_padding_left">0dp</dimen> |