am ba0ce056: Merge "Fix text size in Fake Action Bar. [DO NOT MERGE]" into jb-mr2-dev

* commit 'ba0ce05688ff7ebf91e16f5cb741701feb706fc2':
  Fix text size in Fake Action Bar. [DO NOT MERGE]
This commit is contained in:
Deepanshu Gupta
2014-04-04 01:54:00 +00:00
committed by Android Git Automerger

View File

@@ -290,7 +290,7 @@ abstract class CustomBar extends LinearLayout {
TypedValue out = new TypedValue(); TypedValue out = new TypedValue();
if (ResourceHelper.parseFloatAttribute("textSize", textSize.getValue(), out, if (ResourceHelper.parseFloatAttribute("textSize", textSize.getValue(), out,
true /*requireUnit*/)) { true /*requireUnit*/)) {
textView.setTextSize( textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
out.getDimension(bridgeContext.getResources().getDisplayMetrics())); out.getDimension(bridgeContext.getResources().getDisplayMetrics()));
} }
} }