summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-13 02:19:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 02:19:46 +0000
commitd5de1bd6305dc8885027504996602755b1e79099 (patch)
treedbb9cb4c3f5831d865ee01c7ae3b5914af90a132 /tools/layoutlib
parent8a70bcef5a724906e3c35c58cb2266ee9c9e1b78 (diff)
parent30505abeb6cda9d042ec41f2563d561714eac46b (diff)
downloadframeworks_base-d5de1bd6305dc8885027504996602755b1e79099.zip
frameworks_base-d5de1bd6305dc8885027504996602755b1e79099.tar.gz
frameworks_base-d5de1bd6305dc8885027504996602755b1e79099.tar.bz2
am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit '30505abeb6cda9d042ec41f2563d561714eac46b': Fix text size in Fake Action Bar. [DO NOT MERGE]
Diffstat (limited to 'tools/layoutlib')
-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()));
}
}