diff options
author | Winson Chung <winsonc@google.com> | 2012-05-10 18:04:27 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-10 18:04:27 -0700 |
commit | 6ef94de375e8b3683d4ae9337cf59b5ff294707e (patch) | |
tree | 5fb03f025a66d216d658d6a366e6f9fd8922f038 /res | |
parent | ddf26e7bfeee44ae07242362d18bbf161dd84ea9 (diff) | |
parent | 3e7f2000a81ed6af08d4a7d12bc79a996f13edd4 (diff) | |
download | android_packages_apps_Trebuchet-6ef94de375e8b3683d4ae9337cf59b5ff294707e.tar.gz android_packages_apps_Trebuchet-6ef94de375e8b3683d4ae9337cf59b5ff294707e.tar.bz2 android_packages_apps_Trebuchet-6ef94de375e8b3683d4ae9337cf59b5ff294707e.zip |
Merge "Tweaking the qsb padding to push icons in." into jb-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-port/search_bar.xml | 2 | ||||
-rw-r--r-- | res/values-land/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/styles.xml | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/res/layout-port/search_bar.xml b/res/layout-port/search_bar.xml index 09c6e0986..0ccbe026d 100644 --- a/res/layout-port/search_bar.xml +++ b/res/layout-port/search_bar.xml @@ -28,6 +28,7 @@ android:id="@+id/search_button_container" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="center_vertical" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_toLeftOf="@+id/voice_button_container" @@ -50,6 +51,7 @@ android:id="@+id/voice_button_container" android:layout_width="@dimen/search_bar_height" android:layout_height="match_parent" + android:layout_gravity="center_vertical" android:layout_alignParentRight="true" android:layout_alignParentTop="true" android:gravity="right" diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index e94d78064..eeeed610d 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -18,6 +18,8 @@ <!-- QSB --> <dimen name="toolbar_button_vertical_padding">12dip</dimen> <dimen name="toolbar_button_horizontal_padding">4dip</dimen> + <dimen name="search_bar_padding_left">0dp</dimen> + <dimen name="search_bar_padding_right">0dp</dimen> <!-- Workspace --> <dimen name="hotseat_cell_width">64dp</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d5bcb667d..d468762e9 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -29,6 +29,8 @@ <dimen name="qsb_bar_height">40dp</dimen> <dimen name="qsb_padding_left">0dp</dimen> <dimen name="qsb_padding_right">0dp</dimen> + <dimen name="search_bar_padding_left">8dp</dimen> + <dimen name="search_bar_padding_right">8dp</dimen> <dimen name="search_bar_height">40dp</dimen> <dimen name="workspace_max_gap">16dp</dimen> <dimen name="folder_cell_width">74dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 65b0f3161..3d935a164 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -123,6 +123,8 @@ <item name="android:orientation">horizontal</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> + <item name="android:paddingLeft">@dimen/search_bar_padding_left</item> + <item name="android:paddingRight">@dimen/search_bar_padding_right</item> </style> <style name="SearchButton"> <item name="android:layout_gravity">center_vertical</item> |