summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Sharkey <>2009-03-31 14:59:08 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-31 14:59:08 -0700
commit3fca10b8cd35276879e8e7361b2b9ee72377ab94 (patch)
tree612a2748c1889e1f3eff4932bca05558b352950f
parent2bbcae19224447c018b87bccff2b7f5e650d18d8 (diff)
downloadandroid_packages_apps_Trebuchet-3fca10b8cd35276879e8e7361b2b9ee72377ab94.tar.gz
android_packages_apps_Trebuchet-3fca10b8cd35276879e8e7361b2b9ee72377ab94.tar.bz2
android_packages_apps_Trebuchet-3fca10b8cd35276879e8e7361b2b9ee72377ab94.zip
AI 143792: am: CL 143746 Fix search widget assets to not overlap in landscape mode.
Done by using small button framework assets, but with manual padding adjustments to bring back to original button size. Original author: jsharkey Merged from: //branches/cupcake/... Automated import of CL 143792
-rw-r--r--res/layout/widget_search.xml6
-rw-r--r--res/values/styles.xml7
2 files changed, 11 insertions, 2 deletions
diff --git a/res/layout/widget_search.xml b/res/layout/widget_search.xml
index b4c455cea..f87d30f16 100644
--- a/res/layout/widget_search.xml
+++ b/res/layout/widget_search.xml
@@ -45,17 +45,19 @@
/>
<ImageButton android:id="@+id/search_go_btn"
- android:layout_marginLeft="4dip"
+ android:layout_marginLeft="5dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@*android:drawable/ic_btn_search"
+ style="@style/SearchButton"
/>
<ImageButton android:id="@+id/search_voice_btn"
- android:layout_marginLeft="2dip"
+ android:layout_marginLeft="4dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@android:drawable/ic_btn_speak_now"
+ style="@style/SearchButton"
/>
</com.android.launcher.Search>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a3d3e22c7..9b06d2620 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -53,4 +53,11 @@
<item name="android:layout_marginLeft">10dip</item>
<item name="android:layout_marginRight">10dip</item>
</style>
+
+ <style name="SearchButton" parent="@android:style/Widget.Button.Small">
+ <item name="android:paddingTop">7dip</item>
+ <item name="android:paddingBottom">9dip</item>
+ <item name="android:paddingLeft">10dip</item>
+ <item name="android:paddingRight">10dip</item>
+ </style>
</resources>