| commit | cfe79e9220c996ed9f60fbc00eebb23e7faba2f0 | [log] [tgz] |
|---|---|---|
| author | Bjorn Bringert <bringert@android.com> | Tue Feb 23 06:28:31 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 23 06:28:31 2010 -0800 |
| tree | 63abda3497474b6ca3d4b8ce16c024caa3ed09d7 | |
| parent | d162a114cc2fe36cf0077ea4dc76819cb498788e [diff] | |
| parent | 6cf7a325e6e9e70d9858e21fbb438341332ed254 [diff] |
Merge "Clean up global search and web search activity finding"
diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png index 7acd0df..72faccf 100644 --- a/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png +++ b/core/res/res/drawable-hdpi/btn_search_dialog_default.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png index a8b843a..369be10 100644 --- a/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png +++ b/core/res/res/drawable-hdpi/btn_search_dialog_pressed.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png index cfbc092..7e996ec 100644 --- a/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png +++ b/core/res/res/drawable-hdpi/btn_search_dialog_selected.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png index 3d0d16e..44668b3 100644 --- a/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png +++ b/core/res/res/drawable-hdpi/btn_search_dialog_voice_default.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png index 2ccd3da..3a4571e 100644 --- a/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png +++ b/core/res/res/drawable-hdpi/btn_search_dialog_voice_pressed.9.png Binary files differ
diff --git a/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png b/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png index 966ea44..60dc632 100644 --- a/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png +++ b/core/res/res/drawable-hdpi/btn_search_dialog_voice_selected.9.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png index febf222..437fbc7 100644 --- a/core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png +++ b/core/res/res/drawable-mdpi/btn_search_dialog_voice_default.9.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png index 70a200b..a679426 100644 --- a/core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png +++ b/core/res/res/drawable-mdpi/btn_search_dialog_voice_pressed.9.png Binary files differ
diff --git a/core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png b/core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png index 6f2989f..eb95f22 100644 --- a/core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png +++ b/core/res/res/drawable-mdpi/btn_search_dialog_voice_selected.9.png Binary files differ
diff --git a/core/res/res/layout/search_bar.xml b/core/res/res/layout/search_bar.xml index cf246ba..7935e2a 100644 --- a/core/res/res/layout/search_bar.xml +++ b/core/res/res/layout/search_bar.xml
@@ -34,7 +34,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="12dip" - android:paddingRight="12dip" + android:paddingRight="6dip" android:paddingTop="7dip" android:paddingBottom="16dip" android:background="@drawable/search_plate_global" > @@ -95,7 +95,10 @@ android:id="@+id/search_voice_btn" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginLeft="8dip" + android:layout_marginLeft="0dip" + android:layout_marginTop="-6.5dip" + android:layout_marginBottom="-7dip" + android:layout_marginRight="-5dip" android:background="@drawable/btn_search_dialog_voice" android:src="@android:drawable/ic_btn_speak_now" />
