diff options
author | Winson Chung <winsonc@google.com> | 2011-05-26 15:18:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 15:18:21 -0700 |
commit | 5542d4c929f99e248f56a2721d705c2992752fe0 (patch) | |
tree | 95e65674b4a8f81d06fc54f005fa0cf6e22142b9 /res/values | |
parent | 4d2e54c517f2e9cf451536cf9c126cf9839d49bb (diff) | |
parent | 1cad91e625386885a4b5f82a7fa3f05c5e575750 (diff) | |
download | android_packages_apps_Trebuchet-5542d4c929f99e248f56a2721d705c2992752fe0.tar.gz android_packages_apps_Trebuchet-5542d4c929f99e248f56a2721d705c2992752fe0.tar.bz2 android_packages_apps_Trebuchet-5542d4c929f99e248f56a2721d705c2992752fe0.zip |
Merge "Adding QSB"
Diffstat (limited to 'res/values')
-rw-r--r-- | res/values/dimens.xml | 7 | ||||
-rw-r--r-- | res/values/styles.xml | 24 |
2 files changed, 24 insertions, 7 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 99b124097..9d159f92b 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -15,6 +15,13 @@ --> <resources> +<!-- Workspace --> + <dimen name="qsb_bar_height">56dp</dimen> + +<!-- QSB --> + <dimen name="toolbar_button_vertical_padding">12dip</dimen> + <dimen name="toolbar_button_horizontal_padding">16dip</dimen> + <!-- AllApps/Customize/AppsCustomize --> <!-- Size of icons in Workspace/AppsCustomize --> <dimen name="app_icon_size">50dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index abe6ac4c6..c3e6ce97a 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -68,6 +68,23 @@ <item name="android:layout_marginRight">10dip</item> </style> + <style name="SearchBar"> + <item name="android:orientation">horizontal</item> + </style> + <style name="SearchButton"> + <item name="android:layout_gravity">center_vertical</item> + <item name="android:paddingTop">@dimen/toolbar_button_vertical_padding</item> + <item name="android:paddingBottom">@dimen/toolbar_button_vertical_padding</item> + <item name="android:paddingLeft">@dimen/toolbar_button_horizontal_padding</item> + <item name="android:paddingRight">@dimen/toolbar_button_horizontal_padding</item> + </style> + <style name="SearchButtonDivider"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">match_parent</item> + <item name="android:layout_gravity">center_vertical</item> + </style> + + <style name="TabIndicator"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> @@ -85,13 +102,6 @@ <item name="android:shadowRadius">1.0</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> - <style name="MarketButton"> <item name="android:paddingRight">20dp</item> <item name="android:text">@string/market</item> |