Chris Banes
78c20c89c0
Merge "Make FAB react to window size" into nyc-dev
...
GitOrigin-RevId=94cdf63dbb45423fdc219835e30ae02d39027409
PiperOrigin-RevId: 140560414
2016-12-12 15:52:12 -08:00
Yuichi Araki
7ed2147249
Merge "Fix BottomSheetDialog when it is short" into mnc-ub-dev
...
am: 7cf2a13442
* commit '7cf2a134424e8d7a5095f0df1749bfe871dabb8a':
Fix BottomSheetDialog when it is short
GitOrigin-RevId=bec43dcc29fb7a3494139b470b0481106e1973a9
PiperOrigin-RevId: 140560111
2016-12-12 15:50:55 -08:00
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
d344f52414
Merge "Fix error colours in design lib" into mnc-ub-dev am: c37d0d5de3
...
am: ef445d0c1b
* commit 'ef445d0c1bed0992dcabfada1f96fea1b131b5bf':
Fix error colours in design lib
GitOrigin-RevId=325ee6357c68ff444db3a9f8f0cbc3cf6ecdee82
PiperOrigin-RevId: 140559810
2016-12-12 15:48:26 -08:00
Yuichi Araki
eac74bbf58
Merge "Modal bottom sheet matches screen width by default" into mnc-ub-dev am: bd8ba2fe8d
...
am: 7757039856
* commit '7757039856d1c1bf85f1232a41fcc3bd329ddf34':
Modal bottom sheet matches screen width by default
GitOrigin-RevId=90675c97d475c1092ecc00d29a131d22f0c34574
PiperOrigin-RevId: 140559678
2016-12-12 15:47:41 -08:00
Chris Banes
3b5f834738
Merge "Update TabItem attr docs" into mnc-ub-dev am: f92dff916c
...
am: 3240977802
* commit '3240977802f3e074ba4ee31e8420292c0c68736c':
Update TabItem attr docs
GitOrigin-RevId=cb278d4914b2a65395ad29fdeab7345a4f72519e
PiperOrigin-RevId: 140559632
2016-12-12 15:47:16 -08:00
Chris Banes
1010b1c2ba
Merge "Allow TabLayout items to be added in a layout" into mnc-ub-dev am: d54168f673
...
am: b9fb26837f
* commit 'b9fb26837fabff91b40b710f956fe9ce67b126bc':
Allow TabLayout items to be added in a layout
GitOrigin-RevId=d910e8fb9d1412764450a5b4e7908ae5804396ef
PiperOrigin-RevId: 140559553
2016-12-12 15:46:35 -08:00
Yuichi Araki
bc759d80fe
Merge "Fix BottomSheet over ScrollView" into mnc-ub-dev am: 129ef23221
...
am: 23848059a9
* commit '23848059a9a6265fe9c6db056e7e0d9b5f193f45':
Fix BottomSheet over ScrollView
GitOrigin-RevId=7dfefd41cc64cc46d41d9906526e013d92ef745f
PiperOrigin-RevId: 140559487
2016-12-12 15:46:01 -08:00
Chris Banes
e1f3080a11
Merge "Rename design-lib Theme styleable" into mnc-ub-dev am: 8212a06916
...
am: 8712385fd7
* commit '8712385fd779a65e6ea2d3bff6e0a1c63834cd9f':
Rename design-lib Theme styleable
GitOrigin-RevId=85c657a5ae5913b30cd146750b269ee172fac4ba
PiperOrigin-RevId: 140559477
2016-12-12 15:45:48 -08:00
Chris Banes
2dd5a83240
Merge "Use correct max width for NavigationView" into mnc-ub-dev am: 777691195d
...
am: 9868418ca9
* commit '9868418ca933b8e99bb09fce3f521a05d76589c9':
Use correct max width for NavigationView
GitOrigin-RevId=af22fe4d022d6bdf39e595909206811df98eadad
PiperOrigin-RevId: 140559446
2016-12-12 15:45:24 -08:00
Yuichi Araki
2849c69a2b
Merge "BottomSheetDialog and BottomSheetDialogFragment" into mnc-ub-dev am: 623321eab7
...
am: 911b8ca625
* commit '911b8ca625d9be4f532837ebf8a4e144f339514c':
BottomSheetDialog and BottomSheetDialogFragment
GitOrigin-RevId=7e1cd0b84ec4f183be9cc5025960724092f2cae4
PiperOrigin-RevId: 140559377
2016-12-12 15:45:04 -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
e4ef42e75e
Make Snackbar align text to start am: ae479519bd
...
am: e90b6234a0
* commit 'e90b6234a0027d4b5aa581f84dafbd6880a90513':
Make Snackbar align text to start
GitOrigin-RevId=b6c65667344b001113a92d5319846d9905bca52a
PiperOrigin-RevId: 140559295
2016-12-12 15:44:16 -08:00
Yuichi Araki
021e198166
Merge "Support for use outside of DrawerLayout" into mnc-ub-dev am: 573ba55e84
...
am: bf7e4c6ef6
* commit 'bf7e4c6ef66ee97e2d495b5d80b12c1ef4f82f36':
Support for use outside of DrawerLayout
GitOrigin-RevId=69129b50a95ce5d4dea7cec80a6596e5fdfcd738
PiperOrigin-RevId: 140559277
2016-12-12 15:44:12 -08:00
Yuichi Araki
402ccb38e5
Merge "Add hide feature to BottomSheetBehavior" into mnc-ub-dev am: 9a2aa38cb2
...
am: a58bff0a44
* commit 'a58bff0a44a425e9ae5156458aa30eb66572dd42':
Add hide feature to BottomSheetBehavior
GitOrigin-RevId=3162aeefe11bc17699ca3f8f9e2eb1b475bae5c0
PiperOrigin-RevId: 140559273
2016-12-12 15:44:08 -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
5f7a9cadc6
Merge "Add setHintEnabled to TextInputLayout" into mnc-ub-dev am: f6b1b744cf
...
am: 9e5374f5c6
* commit '9e5374f5c6f1761f0b52f5031d9ebdd89ebc53db':
Add setHintEnabled to TextInputLayout
GitOrigin-RevId=8c32bb6c5e95cb6bf4ccd98c7872ea7b87f805e3
PiperOrigin-RevId: 140551315
2016-12-12 15:42:48 -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
d2162a238b
Merge "Fixes for TextInputLayout" into mnc-ub-dev am: 5db2eb25a6
...
am: 1111ad31e6
* commit '1111ad31e6cefffd8a14d7fa4724a14d47112a92':
Fixes for TextInputLayout
GitOrigin-RevId=ae8119e4d4d6afe1ec07819715f31c0a57a71e4a
PiperOrigin-RevId: 140551230
2016-12-12 15:42:16 -08:00
Yuichi Araki
5c597c8f67
Merge "Fix proguard error of NavigationView" into mnc-ub-dev am: e01e2e8998
...
am: 27b7bd566a
* commit '27b7bd566ab4ece580edf3dca02c34e933888b47':
Fix proguard error of NavigationView
GitOrigin-RevId=09beea53a52130f13d90cca02c2e16290dde7f14
PiperOrigin-RevId: 140551200
2016-12-12 15:41:55 -08:00
Yuichi Araki
0a273d943e
Fix control with dpad for NavigationView am: 23ef6d92a0
...
am: b3b6254d9d
* commit 'b3b6254d9d7c74734f5790368c4ff9913eda6829':
Fix control with dpad for NavigationView
GitOrigin-RevId=a8bdd9bcf04d98c85f69b642f1f939b5a0b18bd2
PiperOrigin-RevId: 140551185
2016-12-12 15:41:51 -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
abb4ccb65b
am 1e777e0d: am d08f5716: Merge "Fix Tab width with using icon + centered tabs" into mnc-ub-dev
...
* commit '1e777e0d0462762c83c89bf58bda2c777aaddc23':
Fix Tab width with using icon + centered tabs
GitOrigin-RevId=371a3b29ae50c2fb66e12e7888ee96221c0e68e2
PiperOrigin-RevId: 140551075
2016-12-12 15:40:54 -08:00
Yuichi Araki
96565fdded
am 121c9e90: am 4e9e5d59: Merge "Initial implementation of BottomSheet" into mnc-ub-dev
...
* commit '121c9e90d5c41a74341a77d18c94f810b73e43f7':
Initial implementation of BottomSheet
GitOrigin-RevId=76fc679eb0d8f1d92ade726550f59a7781de42a0
PiperOrigin-RevId: 140550524
2016-12-12 15:40:42 -08:00
Chris Banes
58aaddd354
am 482d1544: am 7b2f754b: Merge "Disable NavigationView nested header scrolling" into mnc-ub-dev
...
* commit '482d154489e8760ed9b1472dd7062c1925f32816':
Disable NavigationView nested header scrolling
GitOrigin-RevId=2d8e160f6ded2cd22ae7353a11689a1628c6cb5e
PiperOrigin-RevId: 140550392
2016-12-12 15:40:10 -08:00
Mady Mellor
e3918bee1a
am 01bb1c8e: am 0eb4e73f: Merge "Update NavigationView to use CoordinatorLayout for header and list." into mnc-ub-dev
...
* commit '01bb1c8e4dd23ab3140f2f9f34d74947a3193f34':
Update NavigationView to use CoordinatorLayout for header and list.
GitOrigin-RevId=b87b1e3da69e8956fe89907ccdb7988aa2eb726e
PiperOrigin-RevId: 140550156
2016-12-12 15:39:12 -08:00
Yuichi Araki
6e3b920cc1
am c14d808e: am 0e245015: Merge "Add support for character counter" into mnc-ub-dev
...
* commit 'c14d808e6c599ea34990583359ef1d4c4c1640b0':
Add support for character counter
GitOrigin-RevId=7a91a5d0a7de9fc24d0ca45dfdad96761a2f0200
PiperOrigin-RevId: 140550112
2016-12-12 15:38:55 -08:00
Chris Banes
928cc599c2
am b27dc24f: am ec2310cd: Merge "Add ability to snap AppBarLayout children to edges" into mnc-ub-dev
...
* commit 'b27dc24f1e66228c02e96ce9014f6b1ef7e024c8':
Add ability to snap AppBarLayout children to edges
GitOrigin-RevId=ab7326eb4c724c7ab61cb71f890a5fe6a1d18fc6
PiperOrigin-RevId: 140550061
2016-12-12 15:38:43 -08:00
Yuichi Araki
ba00002ac7
am d61aeb86: am 0a9a4969: Merge "Revert "Revert "Use RecyclerView for NavigationView""" into mnc-ub-dev
...
* commit 'd61aeb862e2b28885707764c7cc0d40b6f0afd73':
Revert "Revert "Use RecyclerView for NavigationView""
GitOrigin-RevId=4fd88c3c412d4ce7c34a2a295eeac2cf50825e43
PiperOrigin-RevId: 140550012
2016-12-12 15:38:35 -08:00
Chris Banes
e2d3b46143
am 00699e50: am 3af3cd8e: Merge "Revert "Use RecyclerView for NavigationView"" into mnc-ub-dev
...
* commit '00699e5067877bb3bbd7bb14986cf406b5b9af34':
Revert "Use RecyclerView for NavigationView"
GitOrigin-RevId=8ac0be0819063395f63b14956cea678fbcc93815
PiperOrigin-RevId: 140549987
2016-12-12 15:38:31 -08:00
Yuichi Araki
72d44a5a70
am a51925c0: am c7850385: Merge "Use RecyclerView for NavigationView" into mnc-ub-dev
...
* commit 'a51925c0e9094179d91ceef757d98a6fc9eb3fff':
Use RecyclerView for NavigationView
GitOrigin-RevId=87f9c127ea653d0865131cef284e468228bd2262
PiperOrigin-RevId: 140549964
2016-12-12 15:38:20 -08:00
Chris Banes
a746839748
am 2d53b446: am 9c1a007d: Merge "TabLayout measure performance improvements" into mnc-ub-dev
...
* commit '2d53b446706991c880ab2ec840d191414b8bdd52':
TabLayout measure performance improvements
GitOrigin-RevId=722de5c771c6451be50c7c552c115ef1a3b1afd0
PiperOrigin-RevId: 140549658
2016-12-12 15:37:45 -08:00
Chris Banes
aae3438182
am a568e389: am 3a132609: Merge "Update TabLayout to Material Spec" into mnc-ub-dev
...
* commit 'a568e3895cb632874723a4e9ad78e73741a1a191':
Update TabLayout to Material Spec
GitOrigin-RevId=693502df34175a94caec214ca3cfcddbb6199201
PiperOrigin-RevId: 140549617
2016-12-12 15:37:24 -08:00
Yuichi Araki
9f71df46b7
am eda6efe0: am 36d347c0: NavigationView now supports app:actionLayout
...
* commit 'eda6efe09bd3a95af2c3a6b325a37a3826e6664f':
NavigationView now supports app:actionLayout
GitOrigin-RevId=455e60bc481fc17a3120eae6dad0978210f92b60
PiperOrigin-RevId: 140549445
2016-12-12 15:36:36 -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
6d12b2df86
am 17c194e2: am 07f75828: am 45049689: am f72ee1a4: am 1bb61e03: am eb344aa3: Merge "TextInputLayout fixes" into lmp-mr1-ub-dev
...
* commit '17c194e278b4468cdd715f1969685711e39a6d50':
TextInputLayout fixes
GitOrigin-RevId=b56067e8de4c981094c776cd3b395e3bb2091dd5
PiperOrigin-RevId: 140549343
2016-12-12 15:35:55 -08:00
Chris Banes
c79b3efec5
am f15a504d: am d7054941: am 7755e9f2: am 0086f850: am 6b824bec: Merge "Expand TextInputLayout\'s API with more getters/setters" into lmp-mr1-ub-dev
...
* commit 'f15a504d49dd667ef721daf8a7b6b9a6f853f809':
Expand TextInputLayout's API with more getters/setters
GitOrigin-RevId=0dfcf4cab30e1a401a3c19deaac4cb464655dd32
PiperOrigin-RevId: 140549261
2016-12-12 15:35:39 -08:00
Yuichi Araki
b0d14d0720
am 25b769de: am da2e2715: am ee8e10f5: am 79df1163: am b955ee1e: Make NavigationView scrollbar visible
...
* commit '25b769de19eec577cd5294c78eda425bd565ec8f':
Make NavigationView scrollbar visible
GitOrigin-RevId=6e56755278e8c03ffe6c30c077ac7501a54a4151
PiperOrigin-RevId: 140549245
2016-12-12 15:35:27 -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
84a7653c81
am cbb0b14c: am dace5eb5: am 3814cf37: am 80b7fc1f: Merge "Use Button for Snackbar\'s action" into lmp-mr1-ub-dev
...
* commit 'cbb0b14cdd0a9b7f4a3d6fa2d4ca7594af60e9a7':
Use Button for Snackbar's action
GitOrigin-RevId=dc233a122241c88e5b26f15bbf55aac66860ef8f
PiperOrigin-RevId: 140549204
2016-12-12 15:35:07 -08:00
Chris Banes
873c901ff1
am 2af47f1e: am dbcb805d: am edc34919: am 92f49ee0: Merge "Update default elevation values to spec" into lmp-mr1-ub-dev
...
* commit '2af47f1ef1eaacad2c97182a48643151fefaee9c':
Update default elevation values to spec
GitOrigin-RevId=68ff43f3c595e18ced8bd9862b8e971919734144
PiperOrigin-RevId: 140549192
2016-12-12 15:35:01 -08:00
Chris Banes
681bdb564f
am c8661e9b: am 1ee83f7c: am 7944dd73: am bb829e3d: Merge "Add APIs to set AppBarLayout to be expanded or not" into lmp-mr1-ub-dev
...
* commit 'c8661e9b34d4eb8a6f96ffbd7d35dfed0ff40e2a':
Add APIs to set AppBarLayout to be expanded or not
GitOrigin-RevId=1d1ab069503ab0a7f6ea86ccb15200ea0f0f0ebc
PiperOrigin-RevId: 140549152
2016-12-09 18:21:38 -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
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
7f9d8779a7
am 660bffe7: am 9dc0278c: am 6f96f0e9: am ea61bdd2: Merge "Fix Snackbar sw600dp gravity" into lmp-mr1-ub-dev
...
* commit '660bffe70407ba022449a855cb7c711b104db44e':
Fix Snackbar sw600dp gravity
GitOrigin-RevId=6cfae581f04218dca47aa0732e8613d64620b73e
PiperOrigin-RevId: 140548921
2016-12-09 18:19:42 -08:00
Chris Banes
a4fe57a79c
am e5bbf858: am f79ce487: am bc44b866: am 6ca28414: Merge "Make TabLayout more customizable" into lmp-mr1-ub-dev
...
* commit 'e5bbf858ddc56dd5ce4637bb63db64590358db02':
Make TabLayout more customizable
GitOrigin-RevId=df738a15738226f28bd8407c71a17fb6e222d6d4
PiperOrigin-RevId: 140548895
2016-12-09 18:19:31 -08:00
Chris Banes
c3c5e74e7a
am 9a574b71: am 6dfb913f: am 55e77e6a: am 153fa9a0: Add method to change NavigationView text appearance
...
* commit '9a574b71a77818195b2ff808135002c7de867400':
Add method to change NavigationView text appearance
GitOrigin-RevId=9d9ef01ea4c6511396b26f6f4d14cf42b62732df
PiperOrigin-RevId: 140548868
2016-12-09 18:19:14 -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
8f02c50f98
am ca92a70a: am 6ccc92a3: am c13c14c1: am 39dcb8e6: Merge "Fix NavigationView\'s text appearance" into lmp-mr1-ub-dev
...
* commit 'ca92a70a1e01c4a856c957e0202785fcf60aac14':
Fix NavigationView's text appearance
GitOrigin-RevId=21852106da03ab48e9694eb848968b720fd7d7c4
PiperOrigin-RevId: 140548704
2016-12-09 18:17:33 -08:00