DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
346 Commits 22 Branches 122 Tags
Commit Graph

28 Commits

Author SHA1 Message Date
Chris Banes
76f08c75ad Merge "Revert "Add default style attrs for design components"" into nyc-dev 
GitOrigin-RevId=67bad837194c39a022050c45379ef14f0ad074ff

PiperOrigin-RevId: 140560016
 2016-12-12 15:49:53 -08:00
Chris Banes
298b9aee0f Add default style attrs for design components 
BUG: 27285523
Change-Id: Id19144f3fe58fe61ea132c2ca4fbf2cda5595277

GitOrigin-RevId=7e268c7de8bb10fc24ddda5d237d5cc5ce3b591b

PiperOrigin-RevId: 140560001
 2016-12-12 15:49:49 -08:00
Chris Banes
dbb75c008e Merge "Fix window insets for AppBarLayouts in ViewPager" into mnc-ub-dev am: 75fd07ac98 
am: edc47e19cd

* commit 'edc47e19cddd681bffd02103661b7c03db87c2ce':
  Fix window insets for AppBarLayouts in ViewPager

GitOrigin-RevId=31b690241124e22631b9e9f485bc4dbf88254db1

PiperOrigin-RevId: 140559774
 2016-12-12 15:48:10 -08:00
Chris Banes
9b597185ab Merge "Set a callback on CoL\'s status bar background" into mnc-ub-dev am: 9079ab7c6b 
am: b876a299cc

* commit 'b876a299cc3fb4decf1ecf3a5a0d34b342d4b32a':
  Set a callback on CoL's status bar background

GitOrigin-RevId=77eb6a5e7d1b1462bb4f811724cb42d22f189a2f

PiperOrigin-RevId: 140559768
 2016-12-12 15:48:06 -08:00
Chris Banes
23bd862323 Merge "Fix CollapsingToolbarLayout not drawing a title" into mnc-ub-dev am: af862ffe2a 
am: b66d81e110

* commit 'b66d81e110b9056c448a094e3a21734333d665f1':
  Fix CollapsingToolbarLayout not drawing a title

GitOrigin-RevId=070c7139ee671e10e2197d9cad4015b797cd0e9a

PiperOrigin-RevId: 140559540
 2016-12-12 15:46:31 -08:00
Chris Banes
2a81c19a21 resolve merge conflicts of fc349fd483 to master. 
Change-Id: I94a731888f74c6b0e9d9af60fe752d2086cb0f77

GitOrigin-RevId=874a5968599b8c53212ff49af5c047b1211b547a

PiperOrigin-RevId: 140559358
 2016-12-12 15:44:56 -08:00
Chris Banes
602be1146e Fix CollapsingToolbarLayout.setCollapsedTitleGravity() am: cd7313d4cd 
am: 75eb50cfbb

* commit '75eb50cfbbbc70f9ca9c860db7ae515c9c140cd5':
  Fix CollapsingToolbarLayout.setCollapsedTitleGravity()

GitOrigin-RevId=cb1dff548d640cc7414fd41e9bf0c8302d5e001e

PiperOrigin-RevId: 140551206
 2016-12-12 15:41:59 -08:00
Chris Banes
81ff1336dd resolved conflicts for d687245e to master 
Change-Id: I245e42a399585bd1788db6ba09486ef1c1a6b691

GitOrigin-RevId=c0d908fa15305aa1efe58738c74d54933772186c

PiperOrigin-RevId: 140551108
 2016-12-12 15:41:07 -08:00
Chris Banes
ce2824f39e Merge "Add accessor methods for Toolbar title margins" 
GitOrigin-RevId=2ca24fee9fd3cdba544eb5d55b2b0e37377034fa

PiperOrigin-RevId: 140551085
 2016-12-12 15:40:58 -08:00
Chris Banes
b693c62b6e am c6fccd68: am e667a567: Merge "Use the correct interpolators in the design lib" into mnc-ub-dev 
* commit 'c6fccd6842d28bdedea425ab1e0c947e2e1a41bc':
  Use the correct interpolators in the design lib

GitOrigin-RevId=eda4412df4b985c54913b1ba9dff1ce4d4883cf5

PiperOrigin-RevId: 140550492
 2016-12-12 15:40:34 -08:00
Chris Banes
b5ab60dc9a am c25d71b7: am 756b701d: Merge "Fix CollapsingToolbarLayout when used with SearchView" into mnc-ub-dev 
* commit 'c25d71b7961bb54676a9989b77d9ac4834d5698c':
  Fix CollapsingToolbarLayout when used with SearchView

GitOrigin-RevId=f6cb6956bc3f8af302d222a6534c906f7c67efde

PiperOrigin-RevId: 140550256
 2016-12-12 15:39:44 -08:00
Chris Banes
c3c75f7277 am f2093cd5: am 99e52876: Merge "Improve typeface support in the collapsing text widgets" into mnc-ub-dev 
* commit 'f2093cd5774b9cda59ff146c85cbeb792db65945':
  Improve typeface support in the collapsing text widgets

GitOrigin-RevId=1ff4d4f7470a44dff84f6848d3e2678a7919f594

PiperOrigin-RevId: 140550119
 2016-12-12 15:38:59 -08:00
Chris Banes
bcc48385f7 am d36e64d8: am b1865607: Merge "Fix ABL + CTL not handling being initially collapsed well" into mnc-ub-dev 
* commit 'd36e64d81d2940ddb7f2e2c447622455d5b4eca6':
  Fix ABL + CTL not handling being initially collapsed well

GitOrigin-RevId=1cef72d8a38bf9f897ddb39d6a100f9ee46a76f8

PiperOrigin-RevId: 140549728
 2016-12-12 15:38:08 -08:00
Chris Banes
e8cf5f6678 am 581de875: am 25c8477a: Merge "Improvements around CollapsingToolbarLayout\'s scrims" into mnc-ub-dev 
* commit '581de87570b31ac402eb2be6467227e59c475462':
  Improvements around CollapsingToolbarLayout's scrims

GitOrigin-RevId=8942fdd83bf150fc26e198e1b2dafcbff00e79ef

PiperOrigin-RevId: 140549623
 2016-12-12 15:37:29 -08:00
Chris Banes
d907dd4deb am 2dd67ac0: am 8c6f2081: Merge "Add more helpful exception to design components" into mnc-ub-dev 
* commit '2dd67ac062eb7f7a9a83e4f864eb27b15f416f48':
  Add more helpful exception to design components

GitOrigin-RevId=65fb4571ce472e3ea5d654f51025bb84925f5b22

PiperOrigin-RevId: 140549518
 2016-12-12 15:37:04 -08:00
Chris Banes
af5765e0b3 am 5e600222: am 176c024e: am 97da9578: am 0c7d34bd: am 8ad23944: Merge "Allow CollapsingToolbarLayout\'s title is be disabled" into mnc-dev 
* commit '5e600222dffc923d77c0a7114db6bd50bf832c3e':
  Allow CollapsingToolbarLayout's title is be disabled

GitOrigin-RevId=6581bc819804d2d4bfc59b9fbfa99607d2231439

PiperOrigin-RevId: 140549430
 2016-12-12 15:36:28 -08:00
Chris Banes
2dfb5dcb8a am c5f37b19: am a855043f: am 52c3c45a: am b8d2e466: am f7a85d1c: am 979a9f5a: Merge "Set CollapsingToolbarLayout\'s title from Toolbar" into lmp-mr1-ub-dev 
* commit 'c5f37b199890f3f20c103b8fe2bebf6de61348e3':
  Set CollapsingToolbarLayout's title from Toolbar

GitOrigin-RevId=dee630226ea1959453a9b3705f31d465f03c9e45

PiperOrigin-RevId: 140549354
 2016-12-12 15:36:03 -08:00
Chris Banes
f1937fea78 am c73cabc2: am 86c36405: am 305057fe: am 8f419d93: am fc829ef7: Merge "Overlay custom TextAppearances rather than nuke" into lmp-mr1-ub-dev 
* commit 'c73cabc21cde8a7f324d0faef2c63892ba17dc87':
  Overlay custom TextAppearances rather than nuke

GitOrigin-RevId=48c8ae17e3e809d3644fb969af1e46d7e34e75dd

PiperOrigin-RevId: 140549236
 2016-12-12 15:35:23 -08:00
Chris Banes
2101353fe0 am f2d26678: am da411a43: am ddd03148: am b9c88620: Merge "Setters for CollapsingToolbarLayout title gravity" into lmp-mr1-ub-dev 
* commit 'f2d266785d6d29a1655b15d0aa8b41a565c1fc65':
  Setters for CollapsingToolbarLayout title gravity

GitOrigin-RevId=c75300f13b396cdc6f9b181442f67ec471e2c2a5

PiperOrigin-RevId: 140549140
 2016-12-09 18:21:33 -08:00
Jens Ole Lauridsen
740f51ef66 am 2a109f5a: am ab399fe4: am 6df24a0e: am e3b728db: Merge "DesignTime: Do not use animation in design time." into lmp-mr1-ub-dev 
* commit '2a109f5ac4d23b772837d02e7d8b4752a35723bf':
  DesignTime: Do not use animation in design time.

GitOrigin-RevId=26452251c32daccc9e44102322ea1a0b91318e07

PiperOrigin-RevId: 140548979
 2016-12-09 18:20:15 -08:00
Chris Banes
fd85cc27a5 am c2063e18: am 39e15503: am cdc03eb4: Merge "DesignTime: Compute the size of the collapsed text correctly from start." into mnc-dev 
* commit 'c2063e188ad779fc8672e1cd10281a8b66cda988':
  DesignTime: Compute the size of the collapsed text correctly from start.

GitOrigin-RevId=d93aa96d14039ef51474dfc980b8ca5379686e02

PiperOrigin-RevId: 140548925
 2016-12-09 18:19:47 -08:00
Chris Banes
db024f09c5 am 54933dc7: am 871f7ae0: am 5a27940c: am 1cb0698d: Merge "Improvements to TextInputLayout" into lmp-mr1-ub-dev 
* commit '54933dc742b11f6c2623ea12369719195e6c1bdb':
  Improvements to TextInputLayout

GitOrigin-RevId=2b5f7a8388a2c2de80b33fefd67fae98457efb64

PiperOrigin-RevId: 140548846
 2016-12-09 18:19:03 -08:00
Chris Banes
17f0492030 am 00ede781: am e3b89521: am f42b51c8: Merge "Some fixes for CollapsingToolbarLayout" into lmp-mr1-ub-dev 
* commit '00ede7811fb853bd5d14ad62cb52da4e9ddfe566':
  Some fixes for CollapsingToolbarLayout

GitOrigin-RevId=55af222b777efa2cfd8e2208ca98f19c3b1c30f3

PiperOrigin-RevId: 140548496
 2016-12-09 18:15:36 -08:00
Chris Banes
e8435b7bbd am 5c3341f5: am 4c37ebd8: Merge "Window inset support for CoL + AppBarLayout" into mnc-dev 
* commit '5c3341f5ab819b806ca8f63af6f9e27782e88401':
  Window inset support for CoL + AppBarLayout

GitOrigin-RevId=72659081a3301eeadd659c7a063555260decdb90

PiperOrigin-RevId: 140548433
 2016-12-09 18:15:02 -08:00
Chris Banes
39a893061c am d70e8e02: Merge "Use the internal ValueAnimatorCompat in other widgets" into lmp-mr1-ub-dev 
* commit 'd70e8e024a94ca0f4c3a1e0ce8a456773393a071':
  Use the internal ValueAnimatorCompat in other widgets

GitOrigin-RevId=437af5a85386de8a75ac68e19db1b00e8e05eb24

PiperOrigin-RevId: 140545919
 2016-12-09 18:14:01 -08:00
Chris Banes
d45d59df81 am a196f6c5: Merge "AppBarLayout improvements" into lmp-mr1-ub-dev 
* commit 'a196f6c585e08dd962cb14b659790931a6e92e40':
  AppBarLayout improvements

GitOrigin-RevId=0afaaf631e3c992dc4af9d628444f1eee06758a8

PiperOrigin-RevId: 140545874
 2016-12-09 18:13:51 -08:00
Chris Banes
add53117f9 am 61c2d94f: Merge "AppBarLayout improvements" into lmp-mr1-ub-dev 
* commit '61c2d94faeb79a7a96df402f201a226ed740694a':
  AppBarLayout improvements

GitOrigin-RevId=d836732a8800bb6eebf107696cff44ced8f14afb

PiperOrigin-RevId: 140545788
 2016-12-09 18:13:24 -08:00
Chris Banes
83e56599cd resolved conflicts for merge of 73a0c3c7 to master 
Change-Id: I1652150b1499db455f1eee8d8743d2f7f7bb6fcc

GitOrigin-RevId=c005695ca3e01efb3c3486f5cb6bf1e7fb21995c

PiperOrigin-RevId: 140545763
 2016-12-09 18:13:19 -08:00