diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2013-11-11 12:47:56 +0530 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-01-27 10:31:09 -0800 |
| commit | d8df6b570f10cec486b2af708e9a393f3012317d (patch) | |
| tree | 52c9d5d8ba1a296ae985526cd7b30080cce56804 /tools/layoutlib/bridge/src | |
| parent | 03a057c1af9ca3f125c7924bf0b78da52223d8d3 (diff) | |
| download | frameworks_base-d8df6b570f10cec486b2af708e9a393f3012317d.zip frameworks_base-d8df6b570f10cec486b2af708e9a393f3012317d.tar.gz frameworks_base-d8df6b570f10cec486b2af708e9a393f3012317d.tar.bz2 | |
Fix text size in Fake Action Bar
Merge f4800bc from frameworks/base
Issue: 11436018
Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
Diffstat (limited to 'tools/layoutlib/bridge/src')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java | 2 |
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 7010b3a..86797e5 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())); } } |