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-sw340dp-port/dimens.xml | |
| 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-sw340dp-port/dimens.xml')
| -rw-r--r-- | res/values-sw340dp-port/dimens.xml | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml index bf7ebc3d5..18f28318a 100644 --- a/res/values-sw340dp-port/dimens.xml +++ b/res/values-sw340dp-port/dimens.xml @@ -19,22 +19,9 @@ <dimen name="folderClingMarginTop">70dp</dimen> <!-- Workspace --> - <dimen name="workspace_width_gap">0dp</dimen> - <dimen name="workspace_height_gap">0dp</dimen> - <dimen name="workspace_top_padding">8dp</dimen> - <dimen name="workspace_bottom_padding">8dp</dimen> - <dimen name="workspace_left_padding">8dp</dimen> - <dimen name="workspace_right_padding">8dp</dimen> <dimen name="workspace_divider_padding_left">6dp</dimen> <dimen name="workspace_divider_padding_right">6dp</dimen> - <dimen name="hotseat_width_gap">0dp</dimen> - <dimen name="hotseat_height_gap">0dp</dimen> - <dimen name="hotseat_top_padding">-1dp</dimen> - <dimen name="hotseat_bottom_padding">-1dp</dimen> - <dimen name="hotseat_left_padding">-1dp</dimen> - <dimen name="hotseat_right_padding">-1dp</dimen> - <!-- qsb_bar_height_inset represents qsb_bar_height minus the padding that we put on each page for allowing folders to draw out of bounds --> <dimen name="qsb_bar_height_inset">48dp</dimen> @@ -42,15 +29,6 @@ <dimen name="qsb_padding_left">6dp</dimen> <dimen name="qsb_padding_right">6dp</dimen> <dimen name="search_bar_height">48dp</dimen> - <!-- height of the bottom row of controls --> - <dimen name="button_bar_height">80dip</dimen> - <!-- Because portal animations go beyond the bounds of an icon, we need - to make the dock layout slightly larger than the button_bar_height --> - <dimen name="button_bar_height_top_padding">8dp</dimen> - <dimen name="button_bar_height_bottom_padding">8dp</dimen> - <dimen name="button_bar_width_left_padding">8dp</dimen> - <dimen name="button_bar_width_right_padding">8dp</dimen> - <dimen name="button_bar_height_plus_padding">80dp</dimen> <!-- AppsCustomize --> <dimen name="apps_customize_pageLayoutPaddingTop">16dp</dimen> |