diff options
author | Winson Chung <winsonc@google.com> | 2011-06-19 12:41:22 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2011-06-22 17:26:02 -0700 |
commit | 4b825dcd5f64a5ebb60271844fbc5257374422bc (patch) | |
tree | bc3889079d484952e71bce46f3c47e78d8f40282 /res/values | |
parent | 547eeb3b3e99b79fdab3b74d4e536dc014d0fb0e (diff) | |
download | android_packages_apps_Trebuchet-4b825dcd5f64a5ebb60271844fbc5257374422bc.tar.gz android_packages_apps_Trebuchet-4b825dcd5f64a5ebb60271844fbc5257374422bc.tar.bz2 android_packages_apps_Trebuchet-4b825dcd5f64a5ebb60271844fbc5257374422bc.zip |
Tweaking launcher grid and spacing.
Change-Id: I369a87f473d1e870b2f819221f6383aab340b067
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/attrs.xml | 11 | ||||
-rw-r--r-- | res/values/dimens.xml | 18 | ||||
-rw-r--r-- | res/values/styles.xml | 38 |
3 files changed, 35 insertions, 32 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index ee48aa7a0..284f57472 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -45,20 +45,13 @@ <attr name="cellWidth" format="dimension" /> <!-- The height of a single cell --> <attr name="cellHeight" format="dimension" /> - <!-- Padding to apply at the start of the long axis --> - <attr name="xAxisStartPadding" format="dimension" /> - <!-- Padding to apply at the end of the long axis --> - <attr name="xAxisEndPadding" format="dimension" /> - <!-- Padding to apply at the start of the short axis --> - <attr name="yAxisStartPadding" format="dimension" /> - <!-- Padding to apply at the end of the short axis --> - <attr name="yAxisEndPadding" format="dimension" /> <!-- An override for the width and height gap to allow users to specify a specific size for the page using spacing instead of resolving the spacing from the width of the page --> <attr name="widthGap" format="dimension" /> <attr name="heightGap" format="dimension" /> - + <!-- The max gap size for each dimension --> + <attr name="maxGap" format="dimension" /> </declare-styleable> <!-- StrokedTextView specific attributes. --> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 763ed19ce..36e39949b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -17,6 +17,11 @@ <resources> <!-- Workspace --> <dimen name="qsb_bar_height">56dp</dimen> + <dimen name="workspace_cell_width">80dp</dimen> + <dimen name="workspace_cell_height">80dp</dimen> + <dimen name="workspace_width_gap">-1dp</dimen> + <dimen name="workspace_height_gap">-1dp</dimen> + <dimen name="workspace_max_gap">8dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">12dip</dimen> @@ -24,9 +29,9 @@ <!-- AllApps/Customize/AppsCustomize --> <!-- Size of icons in Workspace/AppsCustomize --> - <dimen name="app_icon_size">50dp</dimen> - <dimen name="apps_customize_cell_width">68dp</dimen> - <dimen name="apps_customize_cell_height">68dp</dimen> + <dimen name="app_icon_size">56dp</dimen> + <dimen name="apps_customize_cell_width">72dp</dimen> + <dimen name="apps_customize_cell_height">72dp</dimen> <!-- In portrat/normal, we peek only 1/8th the app cell width --> <dimen name="apps_customize_peek_width">9dp</dimen> <dimen name="apps_customize_widget_cell_width_gap">10dp</dimen> @@ -79,11 +84,6 @@ <dimen name="dragViewOffsetX">0dp</dimen> <dimen name="dragViewOffsetY">-8dp</dimen> - <!-- Width/height gap overrides for the workspace --> - <dimen name="workspace_width_gap">-1dp</dimen> - <dimen name="workspace_height_gap">-1dp</dimen> - -<!-- Workspace grid --> <!-- Padding applied to AppWidgets --> <dimen name="app_widget_padding_left">0dp</dimen> <dimen name="app_widget_padding_right">0dp</dimen> @@ -92,7 +92,7 @@ <!-- Folders --> <!-- The size of the image which sits behind the preview of the folder contents --> - <dimen name="folder_preview_size">56dp</dimen> + <dimen name="folder_preview_size">64dp</dimen> <!-- The amount that the preview contents are inset from the preview background --> <dimen name="folder_preview_padding">4dp</dimen> <dimen name="folder_padding">18dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 0449b9349..4e498a64c 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -37,35 +37,45 @@ <style name="WorkspaceIcon"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> - <item name="android:paddingLeft">5dip</item> - <item name="android:paddingRight">5dip</item> + <item name="android:layout_gravity">center</item> <item name="android:gravity">center_horizontal</item> <item name="android:singleLine">true</item> <item name="android:ellipsize">marquee</item> - <item name="android:textSize">13dip</item> + <item name="android:textSize">12dip</item> <item name="android:textColor">#FFF</item> <item name="android:shadowRadius">2.0</item> <item name="android:shadowColor">#B0000000</item> </style> - <style name="WorkspaceIcon.AllApps"> + <style name="WorkspaceIcon.AppsCustomize"> <item name="android:background">@null</item> + <item name="android:drawablePadding">0dp</item> + <item name="android:includeFontPadding">false</item> </style> <style name="WorkspaceIcon.Portrait"> - <item name="android:drawablePadding">5dip</item> - <item name="android:paddingTop">0dip</item> - <item name="android:layout_marginLeft">3dip</item> - <item name="android:layout_marginRight">3dip</item> - <item name="android:layout_marginTop">13dip</item> - <item name="android:layout_marginBottom">8dip</item> + <item name="android:drawablePadding">4dp</item> + <item name="android:paddingLeft">4dp</item> + <item name="android:paddingRight">4dp</item> + <item name="android:paddingTop">4dp</item> + <item name="android:paddingBottom">4dp</item> </style> <style name="WorkspaceIcon.Landscape"> - <item name="android:drawablePadding">3dip</item> - <item name="android:paddingTop">2dip</item> - <item name="android:layout_marginLeft">10dip</item> - <item name="android:layout_marginRight">10dip</item> + <item name="android:drawablePadding">0dp</item> + <item name="android:paddingLeft">4dp</item> + <item name="android:paddingRight">4dp</item> + <item name="android:paddingTop">2dp</item> + <item name="android:paddingBottom">4dp</item> + </style> + <style name="WorkspaceIcon.Portrait.Folder"> + <item name="android:drawablePadding">0dp</item> + <item name="android:paddingTop">0dp</item> + </style> + + <style name="WorkspaceIcon.Landscape.Folder"> + <item name="android:drawablePadding">0dp</item> + <item name="android:paddingTop">0dp</item> </style> <style name="SearchDropTargetBar"> |