diff options
| author | Winson Chung <winsonc@google.com> | 2011-11-02 17:45:28 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-02 17:45:28 -0700 |
| commit | 14cee9a9bb10807362595f1d1e486716f997fc00 (patch) | |
| tree | 2388bcdc65b790ef6d2b5220d4c650a9f0403010 | |
| parent | 983632478d4b083251ff1cc1d6c987225aa357ec (diff) | |
| parent | a306da4fb981366a8e87bc72dc0017bc4f32c974 (diff) | |
| download | android_packages_apps_Trebuchet-14cee9a9bb10807362595f1d1e486716f997fc00.tar.gz android_packages_apps_Trebuchet-14cee9a9bb10807362595f1d1e486716f997fc00.tar.bz2 android_packages_apps_Trebuchet-14cee9a9bb10807362595f1d1e486716f997fc00.zip | |
Merge "Updating QSB button padding to reflect change in asset." into ics-mr1
| -rw-r--r-- | res/layout-sw600dp/search_bar.xml | 2 | ||||
| -rw-r--r-- | res/values-port/styles.xml | 1 | ||||
| -rw-r--r-- | res/values-sw600dp/styles.xml | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/res/layout-sw600dp/search_bar.xml b/res/layout-sw600dp/search_bar.xml index d8975b440..b85263250 100644 --- a/res/layout-sw600dp/search_bar.xml +++ b/res/layout-sw600dp/search_bar.xml @@ -44,7 +44,7 @@ <!-- Voice search icon --> <com.android.launcher2.HolographicImageView - style="@style/SearchButton" + style="@style/SearchButton.Voice" android:id="@+id/voice_button" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index d4736406c..d631d1e17 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -21,6 +21,7 @@ <!-- QSB --> <style name="SearchButton.Voice"> <item name="android:paddingLeft">8dp</item> + <item name="android:paddingRight">8dp</item> </style> <!-- Workspace --> diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index d17125c82..b315763d2 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -99,6 +99,10 @@ <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item> <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item> </style> + <style name="SearchButton.Voice"> + <item name="android:paddingLeft">18dp</item> + <item name="android:paddingRight">18dp</item> + </style> <style name="SearchButtonDivider"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> |