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
386 Commits 22 Branches 122 Tags
Commit Graph

23 Commits

Author SHA1 Message Date
Chris Banes
3c6b9a2fed Merge "Fix FloatingActionButton.setBackgroundTint* not working" into mnc-ub-dev 
am: 0960724273

* commit '0960724273891c9f7a9e2f2f6397c0389747b36e':
  Fix FloatingActionButton.setBackgroundTint* not working

GitOrigin-RevId=0f268e050ac69084f9e00bfb149735239704c101

PiperOrigin-RevId: 140560089
 2016-12-12 15:50:43 -08:00
Chris Banes
4c209943d2 Fix some rough edges in AppCompat + VDC 
am: b0f719227b

* commit 'b0f719227b3fa5d5bb7683bd835f7df504fcc733':
  Fix some rough edges in AppCompat + VDC

GitOrigin-RevId=9ed5a4831b5396af50687a5935c65cf0e7322577

PiperOrigin-RevId: 140559945
 2016-12-12 15:49:15 -08:00
Chris Banes
5ae03b2b92 Add compat padding to FloatingActionButton ala CardView am: 6d7a9a0276 
am: eb06ff6cee

* commit 'eb06ff6cee70f60989ef4aa8f41b72b5a47be62d':
  Add compat padding to FloatingActionButton ala CardView

GitOrigin-RevId=7d1cf521d4f62da85bc6abc59ec116b41f86ba53

PiperOrigin-RevId: 140551325
 2016-12-12 15:42:52 -08:00
Chris Banes
6d9f2f26f9 Merge "Add getter for FAB content background" into mnc-ub-dev am: e678582981 
am: 5a5172a97f

* commit '5a5172a97f69fac40fd3c0fd224de6950c233c52':
  Add getter for FAB content background

GitOrigin-RevId=ec6958fca1fe6369b0694ef862e33e79eb04413c

PiperOrigin-RevId: 140551305
 2016-12-12 15:42:44 -08:00
Chris Banes
6dcdedebac Fix crash in FAB background tint am: 9d42ab847a 
am: 3b28559aa3

* commit '3b28559aa396a40992b1c9e7e1e8af215340cd05':
  Fix crash in FAB background tint

GitOrigin-RevId=84921ceb7940a7ce40affb58f22b4a11b35a3e60

PiperOrigin-RevId: 140551245
 2016-12-12 15:42:24 -08:00
Chris Banes
7ab3098919 Respect a FloatingActionButton\'s visibility when anchored am: fc780bab91 
am: fc3aa3564a

* commit 'fc3aa3564a14be1e730840d9efaa284d50881f8a':
  Respect a FloatingActionButton's visibility when anchored

GitOrigin-RevId=ca36356115db162e0cbf145c774fc9e22b24c53d

PiperOrigin-RevId: 140551164
 2016-12-12 15:41:35 -08:00
Chris Banes
d6a1d22a5f Merge "Fix invisible FloatingActionButton pre-ICS" into mnc-ub-dev am: df852a68b1 
am: 6ba8595153

* commit '6ba859515380ab25df28c08870351afb5e26cbcc':
  Fix invisible FloatingActionButton pre-ICS

GitOrigin-RevId=9a46d7ba426a465715b09e87fdd2f315b2822537

PiperOrigin-RevId: 140551144
 2016-12-12 15:41:19 -08:00
Chris Banes
96224f0b1c am 6fcae31d: am b6897193: Merge "Make sure that FAB\'s border respects tint updates" into mnc-ub-dev 
* commit '6fcae31d4ac752e5d81faa0d24d639eadaffe034':
  Make sure that FAB's border respects tint updates

GitOrigin-RevId=89585c84126bbcaf9f8b67ad58d231496e0a3020

PiperOrigin-RevId: 140550536
 2016-12-12 15:40:46 -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
4c7a3b3d71 am f2aa1f53: am 1cd777d1: Merge "Add support for rotating a FAB pre-L" into mnc-ub-dev 
* commit 'f2aa1f53175844f08308f982897a561cfacb2abc':
  Add support for rotating a FAB pre-L

GitOrigin-RevId=fc9ffcbb6b9ca19ef90877ddbf01b132e24e058a

PiperOrigin-RevId: 140550474
 2016-12-12 15:40:30 -08:00
Mark Wei
0cb1c546f3 am e3adcee0: am 26b8f02d: Merge "Add a listener to FloatingActionButton show() and hide()." into mnc-ub-dev 
* commit 'e3adcee09778da7b24941994a34731db4f998ebc':
  Add a listener to FloatingActionButton show() and hide().

GitOrigin-RevId=766ba6e073b1a118c8ab5e8ed3ed4c8756866b2c

PiperOrigin-RevId: 140550244
 2016-12-12 15:39:32 -08:00
Chris Banes
8eddf287b4 am 437a2ac0: am 3d176d20: Merge "Fix tab indicator getting out of sync" into mnc-ub-dev 
* commit '437a2ac0a70bdc2d43731ffb24fedf84615be47a':
  Fix tab indicator getting out of sync

GitOrigin-RevId=1bf420730ddf23747df283caf6f8eba8e86fe7be

PiperOrigin-RevId: 140549544
 2016-12-12 15:37:07 -08:00
Chris Banes
d429d84f73 am c34969a0: am 56277ada: Merge "Fix FAB visibility=gone not working pre-v21" into mnc-ub-dev 
* commit 'c34969a01f875494de19ef6803eaec8147706fde':
  Fix FAB visibility=gone not working pre-v21

GitOrigin-RevId=de530a76ca9bd7befd611663bfbe05d186ea4f0e

PiperOrigin-RevId: 140549482
 2016-12-12 15:36:56 -08:00
Chris Banes
b899270b48 am 1fddbd99: am fe71b8ba: am 025760e0: am 28193403: Merge "Prefix design lib resources to try and avoid conflicts" into lmp-mr1-ub-dev 
* commit '1fddbd999c421df6b31108b8094f46b8008feb5b':
  Prefix design lib resources to try and avoid conflicts

GitOrigin-RevId=ee2beb07a131386685ed7dcbb006fd384bac5386

PiperOrigin-RevId: 140549114
 2016-12-09 18:21:16 -08:00
Chris Banes
3b775ef746 am abc5dba2: am 827a2c0b: am 2970824d: am b6eaf30a: Merge "Show/hide FloatingActionButton improvements" into lmp-mr1-ub-dev 
* commit 'abc5dba21788b954c50a98f47c5464e294b44d19':
  Show/hide FloatingActionButton improvements

GitOrigin-RevId=6f01f83793fc28ed998713bedc1b02a92d1ff127

PiperOrigin-RevId: 140548916
 2016-12-09 18:19:36 -08:00
Chris Banes
dded5c795d am 75962f62: am 40202264: am 3de57119: am cc102ca5: Merge "Re-enable border sheen (aka border)" into lmp-mr1-ub-dev 
* commit '75962f6207ea6f1404d44d0f75c48f7aa9c13adb':
  Re-enable border sheen (aka border)

GitOrigin-RevId=58ca0d90dbcd10a254eb17bed3dd57ab4d111bd2

PiperOrigin-RevId: 140548857
 2016-12-09 18:19:09 -08:00
Chris Banes
07e01a9c06 am 4ae83371: am cc29b5d7: am 302adaa3: Merge "Improve FloatingActionButton border implementation" into lmp-mr1-ub-dev 
* commit '4ae83371c7e0c71a2d2c38999f43f6115b61f6cb':
  Improve FloatingActionButton border implementation

GitOrigin-RevId=02dd0be9fb45ba427988dea8d6d8d2b82e36387b

PiperOrigin-RevId: 140548583
 2016-12-09 18:16:10 -08:00
Chris Banes
0b02fec15c am 1b5d11f9: am 10597477: Merge "FloatingActionButton border" into mnc-dev 
* commit '1b5d11f9e55fa2e5930498d12593a129f6cb497d':
  FloatingActionButton border

GitOrigin-RevId=3154355964d210ce03756261e446bba5a739889c

PiperOrigin-RevId: 140548538
 2016-12-09 18:15:53 -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
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
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
Chris Banes
dd946bba2e am d972c3ba: am d421b2b3: am f4e0b1dd: Merge "TextInputLayout - a wrapper around EditText" into lmp-mr1-ub-dev 
* commit 'd972c3ba1979b8d3710f537de162c362fde0ea30':
  TextInputLayout - a wrapper around EditText

GitOrigin-RevId=809f652c46ec74ffea3505725e577d680a5f47ab

PiperOrigin-RevId: 140545480
 2016-12-09 18:12:14 -08:00
Chris Banes
e114b06a07 am 2ccb1350: am ec957eb4: Merge "Floating Action Button" into lmp-mr1-ub-dev 
* commit '2ccb1350393621eaac6e179e7c6a8c92372f5eb9':
  Floating Action Button

GitOrigin-RevId=a3f7514a6dc54845de30cbee0253279e76fb72c4

PiperOrigin-RevId: 140544624
 2016-12-09 17:56:20 -08:00