diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-30 17:03:09 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-30 17:03:09 -0700 |
| commit | de3fbbc832eaccf08c34fbd233f77fc9d4f77d1a (patch) | |
| tree | 4ab2819e50b4edaf3d2d7ef7ec06fa2d0c6d9769 /res/values | |
| parent | 12d6f9446f4606078e5a67f9c240d24d1ad88ac3 (diff) | |
| parent | 2b8e44577096a737b97c6687fc8ad1f067ea1e89 (diff) | |
| download | android_packages_apps_Trebuchet-de3fbbc832eaccf08c34fbd233f77fc9d4f77d1a.tar.gz android_packages_apps_Trebuchet-de3fbbc832eaccf08c34fbd233f77fc9d4f77d1a.tar.bz2 android_packages_apps_Trebuchet-de3fbbc832eaccf08c34fbd233f77fc9d4f77d1a.zip | |
Merge "Tweaking grid spacing (5162387)"
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/config.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 11 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
4 files changed, 17 insertions, 4 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index e88a83eac..76c9be829 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -44,6 +44,8 @@ <!-- Workspace --> <!-- Whether or not the drop targets drop down as opposed to fade in --> <bool name="config_useDropTargetDownTransition">true</bool> + <!-- Whether or not to fade the side pages --> + <bool name="config_workspaceFadeAdjacentScreens">false</bool> <!-- The transition duration for the background of the drop targets --> <integer name="config_dropTargetBgTransitionDuration">100</integer> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 3eec49fe3..5016894c1 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,8 +22,6 @@ <dimen name="qsb_bar_height">40dp</dimen> <dimen name="workspace_cell_width">80dp</dimen> <dimen name="workspace_cell_height">100dp</dimen> - <dimen name="hotseat_cell_width">64dp</dimen> - <dimen name="hotseat_cell_height">64dp</dimen> <dimen name="workspace_width_gap">-1dp</dimen> <dimen name="workspace_height_gap">-1dp</dimen> <dimen name="workspace_max_gap">16dp</dimen> @@ -33,6 +31,10 @@ <dimen name="workspace_divider_padding_right">12dp</dimen> <dimen name="workspace_divider_padding_top">0dp</dimen> <dimen name="workspace_divider_padding_bottom">0dp</dimen> + <dimen name="hotseat_cell_width">64dp</dimen> + <dimen name="hotseat_cell_height">64dp</dimen> + <dimen name="hotseat_width_gap">-1dp</dimen> + <dimen name="hotseat_height_gap">-1dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">0dip</dimen> @@ -53,7 +55,10 @@ <dimen name="button_bar_height">64dip</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_padding">8dp</dimen> + <dimen name="button_bar_height_top_padding">8dp</dimen> + <dimen name="button_bar_height_bottom_padding">0dp</dimen> + <dimen name="button_bar_width_left_padding">0dp</dimen> + <dimen name="button_bar_width_right_padding">0dp</dimen> <dimen name="button_bar_height_plus_padding">72dp</dimen> <!-- Drag padding to add to the drop targets --> diff --git a/res/values/strings.xml b/res/values/strings.xml index a238eb489..65ed04b96 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -149,7 +149,7 @@ s --> <!-- Noun, menu item used to bring down the notifications shade --> <string name="menu_notifications">Notifications</string> <!-- Noun, menu item used to show the system settings --> - <string name="menu_settings">System Settings</string> + <string name="menu_settings">System settings</string> <!-- Noun, menu item used to show help. [CHAR_LIMIT=none] --> <string name="menu_help">Help</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6e1ae6aaf..b510566e9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -108,6 +108,12 @@ <item name="android:drawablePadding">6dp</item> </style> + <style name="QSBBar"> + <item name="android:orientation">horizontal</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">@dimen/qsb_bar_height</item> + <item name="android:layout_gravity">top|center_horizontal</item> + </style> <style name="SearchDropTargetBar"> <item name="android:orientation">horizontal</item> <item name="android:layout_width">match_parent</item> |