am 23409c2a: Merge "Fixing up search bar and adding bg. (5051804)" into ics-factoryrom

* commit '23409c2a1247a7531348ab1c114eca959d78b37f':
  Fixing up search bar and adding bg. (5051804)
This commit is contained in:
Winson Chung
2011-09-18 16:34:49 -07:00
committed by Android Git Automerger
5 changed files with 10 additions and 9 deletions
+2 -1
View File
@@ -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"
+2 -2
View File
@@ -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>
+2 -2
View File
@@ -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>
+2 -2
View File
@@ -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>
+2 -2
View File
@@ -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>