am 3a02e82c: Merge "Fixing annoying issue where page outlines looked off-center."

* commit '3a02e82cfff354ba5e4444114b1ae2a1d5ac2862':
  Fixing annoying issue where page outlines looked off-center.
This commit is contained in:
Winson Chung
2011-10-10 12:02:46 -07:00
committed by Android Git Automerger
5 changed files with 17 additions and 11 deletions
+1 -1
View File
@@ -44,7 +44,7 @@
android:id="@+id/workspace"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/qsb_bar_height"
android:paddingTop="@dimen/qsb_bar_height_inset"
android:paddingBottom="@dimen/button_bar_height"
launcher:defaultScreen="2"
launcher:cellCountX="4"
+2 -2
View File
@@ -20,8 +20,8 @@
<dimen name="workspace_right_padding">0dp</dimen>
<!-- Block spacing on each side of the screen. And also padding
for the portals to look right. -->
<dimen name="workspace_top_padding">2dp</dimen>
<dimen name="workspace_bottom_padding">2dp</dimen>
<dimen name="workspace_top_padding">6dp</dimen>
<dimen name="workspace_bottom_padding">0dp</dimen>
<dimen name="workspace_page_spacing">-1dp</dimen>
<integer name="apps_customize_cellCountX">4</integer>
+4 -4
View File
@@ -21,10 +21,10 @@
<!-- Workspace -->
<dimen name="workspace_width_gap">0dp</dimen>
<dimen name="workspace_height_gap">0dp</dimen>
<dimen name="workspace_top_padding">-1dp</dimen>
<dimen name="workspace_bottom_padding">-1dp</dimen>
<dimen name="workspace_left_padding">-1dp</dimen>
<dimen name="workspace_right_padding">-1dp</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_top">6dp</dimen>
<dimen name="workspace_divider_padding_bottom">6dp</dimen>
+7 -4
View File
@@ -21,10 +21,10 @@
<!-- Workspace -->
<dimen name="workspace_width_gap">0dp</dimen>
<dimen name="workspace_height_gap">0dp</dimen>
<dimen name="workspace_top_padding">-1dp</dimen>
<dimen name="workspace_bottom_padding">-1dp</dimen>
<dimen name="workspace_left_padding">-1dp</dimen>
<dimen name="workspace_right_padding">-1dp</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>
@@ -35,6 +35,9 @@
<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>
<dimen name="qsb_bar_height">54dp</dimen>
<dimen name="search_bar_height">48dp</dimen>
<!-- height of the bottom row of controls -->
+3
View File
@@ -20,6 +20,9 @@
<dimen name="folderClingMarginTop">20dp</dimen>
<!-- Workspace -->
<!-- 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">34dp</dimen>
<dimen name="qsb_bar_height">40dp</dimen>
<dimen name="search_bar_height">40dp</dimen>
<dimen name="workspace_cell_width">80dp</dimen>