OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7ee92d5
2611180
)
Merge changes from topic "siyamed_maxlines" into oc-mr1-dev
author
Siyamed Sinir
<siyamed@google.com>
Thu, 24 Aug 2017 19:59:22 +0000
(19:59 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 24 Aug 2017 19:59:22 +0000
(19:59 +0000)
* changes:
StaticLayout capped height should be 0 when maxLines=0
Reset StaticLayout.mEllipsized during generate()
Trivial merge