summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-10-31 11:42:39 -0700
committerDanesh M <daneshm90@gmail.com>2014-06-05 23:37:06 -0700
commit0581e23f0f5b50e4bf4834b7439c8614e0c53f5a (patch)
tree395b503d59f330e6556b8ee41f9cfada401e5ac3 /res/values
parent5b8ac02cb568cfa098ca0468a59e7ef3ade095fd (diff)
downloadandroid_packages_apps_Trebuchet-0581e23f0f5b50e4bf4834b7439c8614e0c53f5a.tar.gz
android_packages_apps_Trebuchet-0581e23f0f5b50e4bf4834b7439c8614e0c53f5a.tar.bz2
android_packages_apps_Trebuchet-0581e23f0f5b50e4bf4834b7439c8614e0c53f5a.zip
Tweaking cling text sizes for other languages. (Bug 11151675)
Change-Id: Iae82064b1be7a33e5375c1e27fb7472216dc637a
Diffstat (limited to 'res/values')
-rw-r--r--res/values/dimens.xml6
-rw-r--r--res/values/styles.xml20
2 files changed, 19 insertions, 7 deletions
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7a21f47c3..e783e6dd0 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>