diff options
| author | Winson Chung <winsonc@google.com> | 2011-09-18 16:34:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-18 16:34:49 -0700 |
| commit | 11420792b4d95e2c97350521128a349d3be0778d (patch) | |
| tree | a8633d3b343475dae96dcdb319bbf35e8627c47c /res | |
| parent | fb413c9519cc7f97ac1901a0e55d85784b342bef (diff) | |
| parent | 23409c2a1247a7531348ab1c114eca959d78b37f (diff) | |
| download | android_packages_apps_Trebuchet-11420792b4d95e2c97350521128a349d3be0778d.tar.gz android_packages_apps_Trebuchet-11420792b4d95e2c97350521128a349d3be0778d.tar.bz2 android_packages_apps_Trebuchet-11420792b4d95e2c97350521128a349d3be0778d.zip | |
am 23409c2a: Merge "Fixing up search bar and adding bg. (5051804)" into ics-factoryrom
* commit '23409c2a1247a7531348ab1c114eca959d78b37f':
Fixing up search bar and adding bg. (5051804)
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/qsb_bar.xml | 3 | ||||
| -rw-r--r-- | res/values-sw340dp-land/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values-sw340dp-land/styles.xml | 4 | ||||
| -rw-r--r-- | res/values-sw340dp-port/dimens.xml | 4 | ||||
| -rw-r--r-- | res/values-sw340dp-port/styles.xml | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index c2179ce38..c58836ed8 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -17,7 +17,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" style="@style/QSBBar" - android:focusable="false"> + android:focusable="false" + android:background="@drawable/search_bg_panel"> <!-- Search buttons container --> <include android:id="@+id/qsb_search_bar" diff --git a/res/values-sw340dp-land/dimens.xml b/res/values-sw340dp-land/dimens.xml index 9b062cd19..14fc9917e 100644 --- a/res/values-sw340dp-land/dimens.xml +++ b/res/values-sw340dp-land/dimens.xml @@ -22,8 +22,8 @@ <dimen name="workspace_bottom_padding">-1dp</dimen> <dimen name="workspace_left_padding">-1dp</dimen> <dimen name="workspace_right_padding">-1dp</dimen> - <dimen name="workspace_divider_padding_top">8dp</dimen> - <dimen name="workspace_divider_padding_bottom">8dp</dimen> + <dimen name="workspace_divider_padding_top">4dp</dimen> + <dimen name="workspace_divider_padding_bottom">4dp</dimen> <dimen name="hotseat_width_gap">0dp</dimen> <dimen name="hotseat_height_gap">0dp</dimen> diff --git a/res/values-sw340dp-land/styles.xml b/res/values-sw340dp-land/styles.xml index edd63a4ce..77ce2de67 100644 --- a/res/values-sw340dp-land/styles.xml +++ b/res/values-sw340dp-land/styles.xml @@ -22,7 +22,7 @@ <style name="QSBBar"> <item name="android:orientation">vertical</item> <item name="android:layout_width">@dimen/qsb_bar_height</item> - <item name="android:layout_height">320dp</item> - <item name="android:layout_gravity">left</item> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_gravity">left|center_vertical</item> </style> </resources> diff --git a/res/values-sw340dp-port/dimens.xml b/res/values-sw340dp-port/dimens.xml index a73bb401a..07517ee3a 100644 --- a/res/values-sw340dp-port/dimens.xml +++ b/res/values-sw340dp-port/dimens.xml @@ -22,8 +22,8 @@ <dimen name="workspace_bottom_padding">-1dp</dimen> <dimen name="workspace_left_padding">-1dp</dimen> <dimen name="workspace_right_padding">-1dp</dimen> - <dimen name="workspace_divider_padding_left">8dp</dimen> - <dimen name="workspace_divider_padding_right">8dp</dimen> + <dimen name="workspace_divider_padding_left">4dp</dimen> + <dimen name="workspace_divider_padding_right">4dp</dimen> <dimen name="hotseat_width_gap">0dp</dimen> <dimen name="hotseat_height_gap">0dp</dimen> diff --git a/res/values-sw340dp-port/styles.xml b/res/values-sw340dp-port/styles.xml index 51395b568..c006b85b2 100644 --- a/res/values-sw340dp-port/styles.xml +++ b/res/values-sw340dp-port/styles.xml @@ -24,8 +24,8 @@ <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> - <item name="android:layout_marginLeft">@dimen/workspace_divider_padding_left</item> - <item name="android:layout_marginRight">@dimen/workspace_divider_padding_right</item> + <item name="android:paddingLeft">@dimen/workspace_divider_padding_left</item> + <item name="android:paddingRight">@dimen/workspace_divider_padding_right</item> </style> <style name="SearchButton"> <item name="android:layout_gravity">center_vertical</item> |