summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-08-25 15:27:44 -0700
committerWinson Chung <winsonc@google.com>2011-08-25 15:46:24 -0700
commit725a301a7107e43f1995449c5b96d5cb76dbbe8a (patch)
tree9e06fd7c30feada79486b18823bfd2a5466d421c
parent7ef918374acd7e1564fa1462053b8ac0bfd4ed67 (diff)
downloadandroid_packages_apps_Trebuchet-725a301a7107e43f1995449c5b96d5cb76dbbe8a.tar.gz
android_packages_apps_Trebuchet-725a301a7107e43f1995449c5b96d5cb76dbbe8a.tar.bz2
android_packages_apps_Trebuchet-725a301a7107e43f1995449c5b96d5cb76dbbe8a.zip
Fixing text size issue so that it is scaled. (5176780)
Change-Id: I8816de6afb224a36a60a3aa4d6912c9cdb9acb7b
-rw-r--r--res/values-large/styles.xml14
-rw-r--r--res/values/styles.xml4
2 files changed, 7 insertions, 11 deletions
diff --git a/res/values-large/styles.xml b/res/values-large/styles.xml
index 265eff861..31c2abdbe 100644
--- a/res/values-large/styles.xml
+++ b/res/values-large/styles.xml
@@ -25,14 +25,14 @@
<item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
- <item name="android:textSize">13dip</item>
+ <item name="android:textSize">13sp</item>
</style>
<style name="WorkspaceIcon.Portrait.Folder">
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">0dp</item>
- <item name="android:textSize">13dip</item>
+ <item name="android:textSize">13sp</item>
</style>
<style name="WorkspaceIcon.Landscape">
<item name="android:drawablePadding">0dp</item>
@@ -40,14 +40,14 @@
<item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">4dp</item>
- <item name="android:textSize">13dip</item>
+ <item name="android:textSize">13sp</item>
</style>
<style name="WorkspaceIcon.Landscape.Folder">
<item name="android:paddingLeft">4dp</item>
<item name="android:paddingRight">4dp</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">0dp</item>
- <item name="android:textSize">13dip</item>
+ <item name="android:textSize">13sp</item>
</style>
<style name="Theme" parent="android:Theme.Holo.Wallpaper.NoTitleBar">
@@ -65,16 +65,14 @@
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
<item name="android:drawablePadding">4dp</item>
- <item name="android:includeFontPadding">false</item>
- <item name="android:textSize">13dip</item>
+ <item name="android:textSize">13sp</item>
</style>
<style name="WorkspaceIcon.Landscape.AppsCustomize">
<item name="android:background">@null</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:drawablePadding">4dp</item>
- <item name="android:includeFontPadding">false</item>
- <item name="android:textSize">13dip</item>
+ <item name="android:textSize">13sp</item>
</style>
<style name="TabIndicator.AppsCustomize">
<item name="android:paddingLeft">40dp</item>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 376d5c40c..6e1ae6aaf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -61,7 +61,7 @@
<item name="android:gravity">center_horizontal</item>
<item name="android:singleLine">true</item>
<item name="android:ellipsize">marquee</item>
- <item name="android:textSize">12dip</item>
+ <item name="android:textSize">12sp</item>
<item name="android:textColor">#FFF</item>
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">#B0000000</item>
@@ -100,14 +100,12 @@
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
<item name="android:drawablePadding">8dp</item>
- <item name="android:includeFontPadding">false</item>
</style>
<style name="WorkspaceIcon.Landscape.AppsCustomize">
<item name="android:background">@null</item>
<item name="android:paddingTop">4dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:drawablePadding">6dp</item>
- <item name="android:includeFontPadding">false</item>
</style>
<style name="SearchDropTargetBar">