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
