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

* commit '76b715e556a110d4aa1fec0d4de195e18def8295': Fix text size in Fake Action Bar
2013-11-10 22:54:13 -08:00
parent f0b9ee9637 76b715e556
commit 35631bccd4
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()));
                    }
                }