am e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-dev

* commit 'e45d8b2dab33de18bef5cc5ae7db37b890b22d8d': Fix text size in Fake Action Bar
2013-11-10 22:51:26 -08:00
parent 5773f72457 e45d8b2dab
commit 76b715e556
1 changed files with 1 additions and 1 deletions
--- 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()));
                    }
                }