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
