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

36 Commits

Author SHA1 Message Date
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
986a3cfb5e resolve merge conflicts of b928ccefb6 to nyc-dev 
Change-Id: I966ee45aaa2f8150421d57d8464f03eca47c3c4c

GitOrigin-RevId=df23c413315751774dd83a1d930ae6e83bc21d55

PiperOrigin-RevId: 140559968
 2016-12-12 15:49:32 -08:00
Chris Banes
19311ec2d4 Merge "fix clickable area of FAB on pre-Lollipop devices" 
GitOrigin-RevId=d5d3213d80be767482a89bea6d073006582e2bcc

PiperOrigin-RevId: 140559951
 2016-12-12 15:49:20 -08:00
Kirill Grouchnikov
3cbd4c73e1 Merge "Testing FAB anchoring with AppBarLayout" into nyc-dev 
GitOrigin-RevId=65029163d2263348e4d8db5f371d7de7b621f6d8

PiperOrigin-RevId: 140559940
 2016-12-12 15:49:11 -08:00
Chris Banes
5e60577a55 Merge "Rename FAB elevation methods" into mnc-ub-dev am: e00394c1f1 
am: c51508b44a

* commit 'c51508b44adf1c297ff7e7b82f21dfcbc3f543e0':
  Rename FAB elevation methods

GitOrigin-RevId=67a01cd12b57cb8813116b3b76e3e476849c5d02

PiperOrigin-RevId: 140559362
 2016-12-12 15:45:00 -08:00
Chris Banes
64e35a30fb Update FAB\'s tX even if it\'s not shown am: e33473d0e3 
am: 84c1501ab5

* commit '84c1501ab5d85a8f499e8b1cba6f5176f1703bfd':
  Update FAB's tX even if it's not shown

GitOrigin-RevId=dcebbc1143a1be00a09aa6aa5fb798487cb67d34

PiperOrigin-RevId: 140551504
 2016-12-12 15:44:04 -08:00
Chris Banes
99c3128221 Fix doc build am: 2b1d1d93a9 
am: c9fb40d6a4

* commit 'c9fb40d6a45f9aee03dcef1a4933ec2726d125b1':
  Fix doc build

GitOrigin-RevId=ea0020c36daad1ea3f247ef07723927dead46939

PiperOrigin-RevId: 140551331
 2016-12-12 15:42:56 -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
de8f3fee1c Merge "Add getContentRect() API to FloatingActionButton" into mnc-ub-dev am: c17e2d21b9 
am: ec79e7b839

* commit 'ec79e7b83925b523e2b808acee21d49685562db3':
  Add getContentRect() API to FloatingActionButton

GitOrigin-RevId=e4c7edb212d8c98924971e555ce5162e8947e8c2

PiperOrigin-RevId: 140551261
 2016-12-12 15:42:32 -08:00
Chris Banes
26c6442427 Merge "Fix Snackbar + FloatingActionButton showing simultaneously" into mnc-ub-dev am: 2e659d2367 
am: 437ddfb2fb

* commit '437ddfb2fb32992b157ebd4a88725d78a7a23654':
  Fix Snackbar + FloatingActionButton showing simultaneously

GitOrigin-RevId=e56ec96cc2ef5e1c26f8cd49e6ffdc48ea20ce7c

PiperOrigin-RevId: 140551212
 2016-12-12 15:42:08 -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
c4b471640f am 5a3a72a9: am 9ec922c2: Fix FAB using ICS APIs on Honeycomb 
* commit '5a3a72a99b5d87b3f4d4530ca8d2b0d108eee719':
  Fix FAB using ICS APIs on Honeycomb

GitOrigin-RevId=893cdffb7a013529dd9fde8dcb74b8df1d1fe9f6

PiperOrigin-RevId: 140551128
 2016-12-12 15:41:15 -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
Chris Flatt
194e155946 am 92fc6f44: am 457e4792: Merge "Doc fixes" into mnc-ub-dev 
* commit '92fc6f44df37510b65b2fe5d84d11cdbd7a5af04':
  Doc fixes

GitOrigin-RevId=359567c110b35d51ed8ecaa4b2b163a5452ef43b

PiperOrigin-RevId: 140550454
 2016-12-12 15:40:26 -08:00
Chris Banes
f89dafbdec am 009ff4b8: am 6f800ea6: Merge "FloatingActionButton fixes" into mnc-ub-dev 
* commit '009ff4b8c04a1fbec9617e9499983ea9d4c4a468':
  FloatingActionButton fixes

GitOrigin-RevId=82ae76be36072fc55cd96764cf1c5fc8e61acfdf

PiperOrigin-RevId: 140550251
 2016-12-12 15:39:40 -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
78b0d0b103 am 0004b7b2: am ff19191e: Merge "Make FloatingActionButton focusable" into mnc-ub-dev 
* commit '0004b7b2cabf2937f3056e83a4686f10cb5041f4':
  Make FloatingActionButton focusable

GitOrigin-RevId=20d467e20a3ba8e6fca0769d88c619b8944c284e

PiperOrigin-RevId: 140549567
 2016-12-12 15:37:16 -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
74c3dff7bb am c2ca8014: am 402b0e23: am c58757f9: am 7c6948ec: am 39d1d2d3: FloatingActionButton animation fixes 
* commit 'c2ca8014857698bffcab89e5e50d072ecab65312':
  FloatingActionButton animation fixes

GitOrigin-RevId=9627255824e227213beeedfcde00109c46d7d3bf

PiperOrigin-RevId: 140549411
 2016-12-12 15:36:20 -08:00
Chris Banes
c4df863eec am e37e921e: am ea6ff8cc: am 82ba6aaa: am 5092226e: am 191d8450: resolved conflicts for merge of 7a13c848 to mnc-dev 
* commit 'e37e921e0c9035a4b1fb0d019dc19b2ea0b03c00':
  Return the correct tint/mode from FloatingActionButton

GitOrigin-RevId=03c1bfb5f070231e3257cc2f16974fec94fce4f9

PiperOrigin-RevId: 140549365
 2016-12-12 15:36:08 -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
0f51a3c2de am 193f33fa: am 40fbb22c: am 2521e5cf: am 0b004890: Fix FAB not returning after Snackbar dismissal 
* commit '193f33fa9423e8b3b20751203ba27ebbf93e7fdd':
  Fix FAB not returning after Snackbar dismissal

GitOrigin-RevId=186bde69c35c241489f9d4daf0b5074565067948

PiperOrigin-RevId: 140549033
 2016-12-09 18:20:48 -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
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
72e2a17f23 am 1eb7338d: am 3614493a: am 8eb27627: am 5a86f7c8: Merge "Make the FAB appear visually correct pre-L" into lmp-mr1-ub-dev 
* commit '1eb7338d5214ee0028dae53de08605d4afafe535':
  Make the FAB appear visually correct pre-L

GitOrigin-RevId=80c9ff16bde4556fd9ce0a4988747ffa9e00da69

PiperOrigin-RevId: 140548756
 2016-12-09 18:18:13 -08:00
Chris Banes
6da92f627f am 81186203: am e023adc9: am c0929c71: Merge "Some design lib doc improvements" into lmp-mr1-ub-dev 
* commit '81186203931c7f9162a42c4ba4b8f12a8a8635a9':
  Some design lib doc improvements

GitOrigin-RevId=02f35ca2c877454b1edd6b2ba11c222d7fd4f400

PiperOrigin-RevId: 140548605
 2016-12-09 18:16:21 -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
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
8b48390737 am de373c43: am 1ef42f18: am 29611577: Merge "FAB: Fix NPE with XML attribute, set clickable by default" 
* commit 'de373c43e108bc24b46c947c7a4da26774cdb874':
  FAB: Fix NPE with XML attribute, set clickable by default

GitOrigin-RevId=1f054febf6dc91e7c8d9f61500e498af8582f8b4

PiperOrigin-RevId: 140545843
 2016-12-09 18:13:40 -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
df7f443339 am 911970bb: am 51c19d26: am b7f9224b: Snackbar 
* commit '911970bb8a1337d240e1f87e8c9d969bb99cea90':
  Snackbar

GitOrigin-RevId=65ffbe2a9aad39871ca5a3c85db07be05ea3fc03

PiperOrigin-RevId: 140545521
 2016-12-09 18:12:24 -08:00
Tor Norbye
63b5315476 Merge "Annotate support library with @ColorInt, @CallSuper, etc" 
GitOrigin-RevId=64c055204fe07fa935d6decf5d1195fe366627c2

PiperOrigin-RevId: 140545427
 2016-12-09 18:12:02 -08:00
Chris Banes
fa4ba4df0a am 5e21999c: am cd080cae: am 35f494c9: Merge "Position the FAB visually correct pre-Lollipop" into lmp-mr1-ub-dev 
* commit '5e21999cf0ed0a2d2311635c9e2b85a6734cdab1':
  Position the FAB visually correct pre-Lollipop

GitOrigin-RevId=3f79e3b155eb6c42ae3f8eb9b96ab13b80f777d5

PiperOrigin-RevId: 140545333
 2016-12-09 18:11:35 -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