| commit | 9934230aa2959ee9f1802aa81fd21e25030b0d10 | [log] [tgz] |
|---|---|---|
| author | Chris Banes <chrisbanes@google.com> | Tue Jul 07 15:07:33 2015 +0100 |
| committer | Chris Banes <chrisbanes@google.com> | Tue Jul 07 15:07:33 2015 +0100 |
| tree | 47c72e325ff6451c2c3e7730e1e2bfee56438f55 | |
| parent | 80b7fc1fa8d9200b81b2409347678af79b128a49 [diff] |
Overlay custom TextAppearances rather than nuke Currently if a developer sets a custom TextAppearance on CollapsingToolbarLayout without a text size, it breaks since it doesn't have a text size to use. This is fixed by always loading the default text appearances first, and then overlaying any custom styles. Also fixed the new margin top. BUG: 22316083 Change-Id: I762698120cda501f6e335e41f8ceb82a246627c9