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

62 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
5121b1b672 am bdbc31e3: am 8ce4632e: am 65f10b7f: am 2c638f15: Disable the FAB\'s border for now 
* commit 'bdbc31e3bcd6dc4c20e7093724f42b89c732d6ec':
  Disable the FAB's border for now

GitOrigin-RevId=0cc5d6621e79c9673ef0a785593b835a3a7fc1be

PiperOrigin-RevId: 140548692
 2016-12-09 18:17:22 -08:00
Chris Banes
0a62378d9a am 9cfb0748: am 2967aa90: am f1dfc73b: am 9e810f95: CollapingToolbarLayout styling tweaks 
* commit '9cfb0748f588cfaa13e8377668549dd0405458f6':
  CollapingToolbarLayout styling tweaks

GitOrigin-RevId=aa19bd32ea69c5d32825edec8619569eb6ec6d21

PiperOrigin-RevId: 140548678
 2016-12-09 18:17:11 -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
17f0492030 am 00ede781: am e3b89521: am f42b51c8: Merge "Some fixes for CollapsingToolbarLayout" into lmp-mr1-ub-dev 
* commit '00ede7811fb853bd5d14ad62cb52da4e9ddfe566':
  Some fixes for CollapsingToolbarLayout

GitOrigin-RevId=55af222b777efa2cfd8e2208ca98f19c3b1c30f3

PiperOrigin-RevId: 140548496
 2016-12-09 18:15:36 -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
f97e509fd1 am 3e528269: am 81666c3d: am 60d5509d: Merge "Tidy up styling and tinting in NavigationView" into lmp-mr1-ub-dev 
* commit '3e5282695431eecbca0121099e61eb1b7ee309a3':
  Tidy up styling and tinting in NavigationView

GitOrigin-RevId=8ed9cfc9a0546b167f530af37b94109505c2af07

PiperOrigin-RevId: 140548396
 2016-12-09 18:14:51 -08:00
Chris Banes
214eb4cd26 am 645ee0b3: am 0a1e4545: am 9f97e0cc: Merge "Add app:headerLayout attribute to NavigationView" into lmp-mr1-ub-dev 
* commit '645ee0b387c51db25ba97191e75ef6dc99b16059':
  Add app:headerLayout attribute to NavigationView

GitOrigin-RevId=e2244b4276dd1cc024d9af0f0a59e19855d8d6b1

PiperOrigin-RevId: 140548330
 2016-12-09 18:14:24 -08:00
Chris Banes
1af29a268f am 4ac0c26b: am 209a3f06: Merge commit \'e45b270f\' into manualmerge 
* commit '4ac0c26bf6d0fb5a329d29732fa073db8b6eab70':
  TabLayout text color handling improvements

GitOrigin-RevId=774c8e5043c5da467069d4a0f175478922d8d20a

PiperOrigin-RevId: 140548321
 2016-12-09 18:14:19 -08:00
Chris Banes
ba057cf497 am 81520564: Set default background for AppBarLayout 
* commit '81520564f3dd783136e025174021ba4eabd6ff3c':
  Set default background for AppBarLayout

GitOrigin-RevId=8b79edbc66759ce2af89ae8d4f1437393729f735

PiperOrigin-RevId: 140545799
 2016-12-09 18:13:30 -08:00
Chris Banes
add53117f9 am 61c2d94f: Merge "AppBarLayout improvements" into lmp-mr1-ub-dev 
* commit '61c2d94faeb79a7a96df402f201a226ed740694a':
  AppBarLayout improvements

GitOrigin-RevId=d836732a8800bb6eebf107696cff44ced8f14afb

PiperOrigin-RevId: 140545788
 2016-12-09 18:13:24 -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
Yuichi Araki
2d1a0b3c08 am 60abdeb3: Fix paddings for separators in NavigationView 
* commit '60abdeb39630c4c74a4c401e221f0c968caa26f5':
  Fix paddings for separators in NavigationView

GitOrigin-RevId=33f392c4af56954740eecc5f7d7fe25a1e71aacf

PiperOrigin-RevId: 140545706
 2016-12-09 18:13:02 -08:00