summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2013-11-08 16:43:07 +0530
committerDeepanshu Gupta <deepanshu@google.com>2014-05-06 14:02:44 -0700
commit30505abeb6cda9d042ec41f2563d561714eac46b (patch)
treeaf42df6a9b013972e6581b50964f9b886609b326 /tools/layoutlib/bridge
parent5a7b3b65b691edbdb855eb6154b8b30f5700acbb (diff)
downloadframeworks_base-30505abeb6cda9d042ec41f2563d561714eac46b.zip
frameworks_base-30505abeb6cda9d042ec41f2563d561714eac46b.tar.gz
frameworks_base-30505abeb6cda9d042ec41f2563d561714eac46b.tar.bz2
Fix text size in Fake Action Bar. [DO NOT MERGE]
The density multiplier was being applied twice to the title text in the fake action bar. Bug: 11436018 Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf (cherry-picked from 083d1562e00631630b5594462ce4a867a3508d8d)
Diffstat (limited to 'tools/layoutlib/bridge')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
index ec9ec75..11fd697 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java
@@ -274,7 +274,7 @@ public abstract class CustomBar extends LinearLayout {
TypedValue out = new TypedValue();
if (ResourceHelper.parseFloatAttribute("textSize", textSize.getValue(), out,
true /*requireUnit*/)) {
- textView.setTextSize(
+ textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
out.getDimension(bridgeContext.getResources().getDisplayMetrics()));
}
}