commit d4e6727d02f7507fdfd6cbbabd03d6e922127e4b
author Deepanshu Gupta <deepanshu@google.com> Tue May 13 16:31:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue May 13 16:31:31 2014 +0000
tree f5d552589480c6ee8a56f95649d66248f910ecea
parent ed98abecad359ab1765ac1f698c8ba06dbd00745
parent d5de1bd6305dc8885027504996602755b1e79099

am d5de1bd6: am 30505abe: Fix text size in Fake Action Bar. [DO NOT MERGE]

* commit 'd5de1bd6305dc8885027504996602755b1e79099':
  Fix text size in Fake Action Bar. [DO NOT MERGE]

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java

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 ea9d8d9..99dc5ad 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 @@
                     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()));
                     }
                 }