summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2013-11-11 06:48:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-11-11 06:48:32 +0000
commite45d8b2dab33de18bef5cc5ae7db37b890b22d8d (patch)
treeda122fed2243491f45c721264af0175e9a2a2114
parentdd4f9e8b61c0a5639aa82480b7fdd760a2ed609c (diff)
parentf4800bc3b122828d61a34caecbf782eee170ae59 (diff)
Merge "Fix text size in Fake Action Bar" into klp-dev
-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 17b0eb641efa..bcd08eb47070 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
@@ -290,7 +290,7 @@ 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()));
}
}