summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2014-05-02 19:31:15 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-05-02 19:31:15 +0000
commit43ed35da99e500182b176ea74f0cd051a3325f39 (patch)
tree5ec7f0d53bd8fc7647b44803e97998a09a5f82ae
parentaab9d9a75cac9f1ed8291a5820d676c2eadc8b4d (diff)
parentce205d0a3b88e12127a8c717ff913fce2d59e36d (diff)
am ce205d0a: am 600539c7: am 083d1562: Fix text size in Fake Action Bar. [DO NOT MERGE]
* commit 'ce205d0a3b88e12127a8c717ff913fce2d59e36d': Fix text size in Fake Action Bar. [DO NOT MERGE]
-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()));
}
}