diff options
| author | Winson Chung <winsonc@google.com> | 2011-08-03 14:48:25 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-03 14:48:25 -0700 |
| commit | 459814b7e6d6c9bb6b0569dcedb455f6fab3aa9c (patch) | |
| tree | aa2e652ae8388b425107a49673d90da41609682a /res | |
| parent | 7578ec6fa9a747210aba484d226b5f97773752e3 (diff) | |
| parent | 54c725cc294cd43ed0650179bfae64a622547660 (diff) | |
| download | android_packages_apps_Trebuchet-459814b7e6d6c9bb6b0569dcedb455f6fab3aa9c.tar.gz android_packages_apps_Trebuchet-459814b7e6d6c9bb6b0569dcedb455f6fab3aa9c.tar.bz2 android_packages_apps_Trebuchet-459814b7e6d6c9bb6b0569dcedb455f6fab3aa9c.zip | |
Merge "Bug fixes"
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/search_bar.xml | 4 | ||||
| -rw-r--r-- | res/layout-large/search_bar.xml | 4 | ||||
| -rw-r--r-- | res/layout-port/search_bar.xml | 4 | ||||
| -rw-r--r-- | res/values-large/styles.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/res/layout-land/search_bar.xml b/res/layout-land/search_bar.xml index 0dbfd7b35..452a80c22 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/search_bar.xml @@ -27,7 +27,7 @@ android:layout_height="wrap_content" android:src="@drawable/ic_search_normal_holo" android:adjustViewBounds="true" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:onClick="onClickSearchButton" android:focusable="true" android:clickable="true" @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:src="@drawable/ic_voice_search_holo" android:adjustViewBounds="true" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" diff --git a/res/layout-large/search_bar.xml b/res/layout-large/search_bar.xml index e26a96a48..d6482feb5 100644 --- a/res/layout-large/search_bar.xml +++ b/res/layout-large/search_bar.xml @@ -28,7 +28,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:src="@drawable/ic_search_normal_holo" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:onClick="onClickSearchButton" android:focusable="true" android:clickable="true" @@ -51,7 +51,7 @@ android:layout_height="wrap_content" android:layout_toRightOf="@+id/search_divider" android:src="@drawable/ic_voice_search_holo" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml index 0de290a04..b65da0b65 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/search_bar.xml @@ -27,7 +27,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_toLeftOf="@+id/voice_button" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:onClick="onClickSearchButton" android:focusable="true" android:clickable="true" @@ -50,7 +50,7 @@ android:layout_alignParentTop="true" android:src="@drawable/ic_voice_search_holo" android:adjustViewBounds="true" - android:background="@drawable/button_bg" + android:background="?android:attr/selectableItemBackground" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml index ea1a8e635..41bd9cd22 100644 --- a/res/values-large/styles.xml +++ b/res/values-large/styles.xml @@ -94,7 +94,7 @@ </style> <style name="DropTargetButton"> <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> + <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> <item name="android:gravity">center_vertical</item> <item name="android:drawablePadding">7.5dp</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index b356a424b..15ca427a7 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -104,7 +104,7 @@ </style> <style name="DropTargetButton"> <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> + <item name="android:layout_height">match_parent</item> <item name="android:layout_gravity">center</item> <item name="android:gravity">center_vertical</item> <item name="android:drawablePadding">7.5dp</item> |