diff options
| author | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-03-01 16:26:50 -0800 |
| commit | 826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec (patch) | |
| tree | 1ba6f2151cba45b5e7d07cd61a44f6b59a3f828f /res/values-sw600dp-land | |
| parent | ca83eeb0919b690350d86a9562f58a5a56d196bf (diff) | |
| parent | a3e22d6a362260d5b81feefbc91e4757e3d58958 (diff) | |
| download | android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.gz android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.tar.bz2 android_packages_apps_Trebuchet-826a661d5bae6a5e2e3bd8fa46a1cae9e68fe2ec.zip | |
resolved conflicts for merge of a3e22d6a to master
Change-Id: I8770574acf86e280a9d15d4309686111260e09d9
Diffstat (limited to 'res/values-sw600dp-land')
| -rw-r--r-- | res/values-sw600dp-land/dimens.xml | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml index 42c435379..0e7d63cd2 100644 --- a/res/values-sw600dp-land/dimens.xml +++ b/res/values-sw600dp-land/dimens.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2009 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,33 +15,28 @@ --> <resources> + <dimen name="app_icon_size">65dp</dimen> + <dimen name="app_icon_padding_top">2dp</dimen> + +<!-- Hotseat --> + <dimen name="hotseat_cell_width">75dp</dimen> + <dimen name="hotseat_cell_height">85dp</dimen> + <!-- Workspace --> - <dimen name="workspace_left_padding">24dip</dimen> - <dimen name="workspace_right_padding">24dip</dimen> - <!-- We need padding on the screens for portals to look right --> - <dimen name="workspace_top_padding">12dip</dimen> - <dimen name="workspace_bottom_padding">12dip</dimen> + <dimen name="workspace_cell_width">96dp</dimen> + <dimen name="workspace_cell_height">86dp</dimen> <dimen name="workspace_width_gap">32dp</dimen> - <dimen name="workspace_height_gap">2dp</dimen> - <dimen name="workspace_page_spacing">50dp</dimen> + <dimen name="workspace_height_gap">0dp</dimen> - <!-- the area at the edge of the screen that makes the workspace go left - or right while you're dragging. --> - <dimen name="scroll_zone">100dip</dimen> +<!-- Folders --> + <!-- The size of the image which sits behind the preview of the folder contents --> + <dimen name="folder_preview_size">70dp</dimen> + <dimen name="folder_cell_width">86dp</dimen> + <dimen name="folder_cell_height">86dp</dimen> +<!-- AppsCustomize --> <dimen name="apps_customize_pageLayoutWidthGap">36dp</dimen> <dimen name="apps_customize_pageLayoutHeightGap">8dp</dimen> <dimen name="apps_customize_pageLayoutPaddingTop">20dp</dimen> <dimen name="apps_customize_pageLayoutPaddingBottom">14dp</dimen> - <dimen name="apps_customize_pageLayoutPaddingLeft">30dp</dimen> - <dimen name="apps_customize_pageLayoutPaddingRight">30dp</dimen> - <integer name="apps_customize_widget_cell_count_x">3</integer> - <integer name="apps_customize_widget_cell_count_y">2</integer> - <integer name="apps_customize_cling_focused_x">4</integer> - <integer name="apps_customize_cling_focused_y">2</integer> - -<!-- Cling --> - <!-- The offset for the text in the cling --> - <dimen name="cling_text_block_offset_x">140dp</dimen> - <dimen name="cling_text_block_offset_y">80dp</dimen> </resources> |