am 455b351b: Merge "Make elegantTextHeight xml attribute public" into lmp-preview-dev

* commit '455b351bba515c3a7e6139368c4110abbf1e4e89':
  Make elegantTextHeight xml attribute public

diff --cc api/current.txt
Simple merge

diff --cc core/res/res/values/public.xml
index 3b28bff,5d9f3e5..e048c68
--- 1/core/res/res/values/public.xml
--- 2/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@@ -2178,11 -2178,8 +2178,12 @@@
    <public type="attr" name="contentInsetLeft" />
    <public type="attr" name="contentInsetRight" />
    <public type="attr" name="paddingMode" />
 +  <public type="attr" name="layout_rowWeight" />
 +  <public type="attr" name="layout_columnWeight" />
 +  <public type="attr" name="translateX" />
 +  <public type="attr" name="translateY" />
    <public type="attr" name="selectableItemBackgroundBorderless" />
+   <public type="attr" name="elegantTextHeight" />
  
    <public-padding type="dimen" name="l_resource_pad" end="0x01050010" />