diff options
author | Winson Chung <winsonc@google.com> | 2013-09-03 17:48:37 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-09-05 12:14:28 -0700 |
commit | c58497ee619416c4949b16eb43486c11618b69e5 (patch) | |
tree | b8bfd3ec331885a25f42c69fb41dbfd861a4763a /res/values | |
parent | 2d8de5845be5f49d3767b8354f0d5479a0715abe (diff) | |
download | android_packages_apps_Trebuchet-c58497ee619416c4949b16eb43486c11618b69e5.tar.gz android_packages_apps_Trebuchet-c58497ee619416c4949b16eb43486c11618b69e5.tar.bz2 android_packages_apps_Trebuchet-c58497ee619416c4949b16eb43486c11618b69e5.zip |
Initial changes to restore AllApps.
- Removes unused all apps code due to dynamic grid/spacing
- Attempts to use CellLayout instead of PagedViewCellLayout
Change-Id: I3c49bca9fc35dfeaf250591fd63bc7f36119968f
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/colors.xml | 2 | ||||
-rw-r--r-- | res/values/dimens.xml | 9 | ||||
-rw-r--r-- | res/values/styles.xml | 12 |
3 files changed, 5 insertions, 18 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index c2e1e7b4d..bd561edce 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -30,4 +30,6 @@ <color name="workspace_all_apps_and_delete_zone_text_color">#CCFFFFFF</color> <color name="workspace_all_apps_and_delete_zone_text_shadow_color">#A0000000</color> <color name="workspace_icon_text_color">#FFF</color> + + <color name="apps_customize_icon_text_color">#FFF</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e557c3e35..7a1a7aaf8 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -51,23 +51,16 @@ <dimen name="toolbar_external_icon_height">36dp</dimen> <!-- AllApps/Customize/AppsCustomize --> - <integer name="apps_customize_maxCellCountX">-1</integer> - <integer name="apps_customize_maxCellCountY">-1</integer> <!-- The height of the tab bar - if this changes, we should update the external icon width/height above to compensate --> <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> - <!-- The width can be 72dp because we don't have L/R padding --> - <dimen name="apps_customize_cell_width">74dp</dimen> - <dimen name="apps_customize_cell_height">82dp</dimen> - <dimen name="apps_customize_max_gap">18dp</dimen> - <dimen name="apps_customize_widget_cell_width_gap">10dp</dimen> - <dimen name="apps_customize_widget_cell_height_gap">8dp</dimen> <!-- The AppsCustomize page indicator --> <dimen name="apps_customize_page_indicator_height">12dp</dimen> <dimen name="apps_customize_page_indicator_margin">4dp</dimen> + <dimen name="apps_customize_page_indicator_offset">16dp</dimen> <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index f41c8eba8..6eb044cda 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -83,21 +83,13 @@ <style name="WorkspaceIcon.Portrait.AppsCustomize"> <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> - <item name="android:singleLine">false</item> - <item name="android:maxLines">2</item> <item name="android:background">@null</item> - <item name="android:paddingTop">0dp</item> - <item name="android:paddingBottom">0dp</item> - <item name="android:paddingStart">0dp</item> - <item name="android:paddingEnd">0dp</item> - <item name="android:drawablePadding">2dp</item> + <item name="android:textColor">@color/apps_customize_icon_text_color</item> </style> <style name="WorkspaceIcon.Landscape.AppsCustomize"> <item name="android:shadowRadius">0.0</item> <!-- Don't use text shadow --> <item name="android:background">@null</item> - <item name="android:paddingTop">4dp</item> - <item name="android:paddingBottom">0dp</item> - <item name="android:drawablePadding">6dp</item> + <item name="android:textColor">@color/apps_customize_icon_text_color</item> </style> <style name="QSBBar"> |