diff options
| author | Winson Chung <winsonc@google.com> | 2013-11-01 19:45:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-01 19:45:20 +0000 |
| commit | c44a0c0728dcb2ff410a10b426136926789c20a1 (patch) | |
| tree | 886946225afc9e3185bf3c09572fb035b38d5ec3 /res/values | |
| parent | 61141565ca3ed6163f2e41d1a18007f80f3fdd03 (diff) | |
| parent | 13dbfe18a0e1c4a9a1e9a2a9f8d22c4f462a30e4 (diff) | |
| download | android_packages_apps_Trebuchet-c44a0c0728dcb2ff410a10b426136926789c20a1.tar.gz android_packages_apps_Trebuchet-c44a0c0728dcb2ff410a10b426136926789c20a1.tar.bz2 android_packages_apps_Trebuchet-c44a0c0728dcb2ff410a10b426136926789c20a1.zip | |
Merge "Tweaking cling text sizes for other languages. (Bug 11151675)" into jb-ub-now-jetsonic
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/dimens.xml | 6 | ||||
| -rw-r--r-- | res/values/styles.xml | 20 |
2 files changed, 19 insertions, 7 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d87fb1431..4242cc768 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -38,6 +38,12 @@ <add-resource type="dimen" name="custom_cling_margin_top" /> <add-resource type="dimen" name="custom_cling_margin_right" /> <add-resource type="dimen" name="custom_cling_margin_left" /> + + <dimen name="cling_title_text_size">20sp</dimen> + <dimen name="cling_text_size">14sp</dimen> + <dimen name="cling_alt_title_text_size">24sp</dimen> + <dimen name="cling_alt_text_size">16sp</dimen> + <dimen name="cling_hint_text_size">14sp</dimen> <!-- Workspace --> <dimen name="workspace_max_gap">16dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 39e55d894..8226915dd 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -52,27 +52,33 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_marginBottom">5dp</item> - <item name="android:textSize">22sp</item> + <item name="android:textSize">@dimen/cling_title_text_size</item> <item name="android:textColor">#ffffff</item> <item name="android:fontFamily">sans-serif-condensed</item> </style> + <style name="ClingText"> + <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">wrap_content</item> + <item name="android:textSize">@dimen/cling_text_size</item> + <item name="android:textColor">#80000000</item> + <item name="android:lineSpacingMultiplier">1.1</item> + </style> <style name="ClingAltTitleText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">24sp</item> + <item name="android:textSize">@dimen/cling_alt_title_text_size</item> <item name="android:textColor">#49C0EC</item> </style> - <style name="ClingText"> + <style name="ClingAltText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">16sp</item> - <item name="android:textColor">#80000000</item> - <item name="android:lineSpacingMultiplier">1.1</item> + <item name="android:textSize">@dimen/cling_alt_text_size</item> + <item name="android:textColor">#49C0EC</item> </style> <style name="ClingHintText"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">18sp</item> + <item name="android:textSize">@dimen/cling_hint_text_size</item> <item name="android:textColor">#80ffffff</item> <item name="android:fontFamily">sans-serif-condensed</item> </style> |