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

28 Commits

Author SHA1 Message Date
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
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
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
Yuichi Araki
89db87437c am c1cc9423: Merge "Fix crash of NavigationView on Gingerbread" into lmp-mr1-ub-dev 
* commit 'c1cc9423564f0753d31e8c5826ac6e44e5b009a1':
  Fix crash of NavigationView on Gingerbread

GitOrigin-RevId=c5f875a4f738ddf69dda74cea21f713b68e4b1f6

PiperOrigin-RevId: 140545827
 2016-12-09 18:13:35 -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
Chris Banes
1746f3f4b9 am fb4d5402: Merge "Add app:menu attribute to NavigationView" into lmp-mr1-ub-dev 
* commit 'fb4d54028db8f328d98edf641654e8e7a83fa89e':
  Add app:menu attribute to NavigationView

GitOrigin-RevId=de2325c02dd92b683db1ab3798353452c1a4a68a

PiperOrigin-RevId: 140545605
 2016-12-09 18:12:35 -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
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
Adam Powell
edcd873a36 am 37803f10: am 69f431ff: am a966c6cd: CoordinatorLayout 
* commit '37803f1030d6f02e0194b00ab08df27b7e62f4b1':
  CoordinatorLayout

GitOrigin-RevId=38d11eb0946c89652edf9eafc8cf55a8ac962a2e

PiperOrigin-RevId: 140545349
 2016-12-09 18:11:41 -08:00
Yuichi Araki
ad24f144d6 am 3f59ee95: am 795b01f0: am 00f28027: Merge "Rename NavigationDrawerView to NavigationView" into lmp-mr1-ub-dev 
* commit '3f59ee9538b374910da37aab77009bc69a5aa522':
  Rename NavigationDrawerView to NavigationView

GitOrigin-RevId=198eda17b028c405197cd7f244626d09e5092cf9

PiperOrigin-RevId: 140545306
 2016-12-09 18:11:24 -08:00
Yuichi Araki
1ca419753d am d111b070: am d765df61: am 74eafa02: Merge "Add selection feature to NavigationDrawerView." into lmp-mr1-ub-dev 
* commit 'd111b07014a5a37a85dc38127aba5808b67505b9':
  Add selection feature to NavigationDrawerView.

GitOrigin-RevId=2a91fc7d0b22e2c9d92012f5d58670364a6a1337

PiperOrigin-RevId: 140545288
 2016-12-09 18:11:14 -08:00
Yuichi Araki
440a30fec3 am b3a4fa78: am bd35b10d: Merge "Implement features for NavigationDrawerView menu" into lmp-mr1-ub-dev 
* commit 'b3a4fa780f5ca626f579b91f9924435638c6824b':
  Implement features for NavigationDrawerView menu

GitOrigin-RevId=04be515e47761827cfc6d6f31ada5c6937af0dfd

PiperOrigin-RevId: 140545263
 2016-12-09 18:11:08 -08:00
Chris Banes
45318f8c4b am a5f441b7: am 320c3e9f: New TabLayout 
* commit 'a5f441b7d4d93da2adb4b48dab8ccb5d8457c63c':
  New TabLayout

GitOrigin-RevId=9eeb20e99abdac385954a785383b10eba51908e1

PiperOrigin-RevId: 140545228
 2016-12-09 18:09:27 -08:00
Yuichi Araki
30b1bcd3e6 am d3da39bb: am 2b9dabda: Merge "Initial implementation of NavigationDrawer" into lmp-mr1-ub-dev 
* commit 'd3da39bbe4b007d3ee2dadd318d55b0e06697b89':
  Initial implementation of NavigationDrawer

GitOrigin-RevId=e06c9b9db020326166a5591c0483c03377418437

PiperOrigin-RevId: 140545176
 2016-12-09 18:09:18 -08:00
Yuichi Araki
36b99e40c8 am bd3ea239: am 9ea42dba: Merge "Revert "Initial implementation of NavigationDrawer"" into lmp-mr1-ub-dev 
* commit 'bd3ea23910845c29f3d49cc3b241ff352f9fb120':
  Revert "Initial implementation of NavigationDrawer"

GitOrigin-RevId=02a27e6a640f57d55984ab31b814048507e73352

PiperOrigin-RevId: 140545170
 2016-12-09 18:05:30 -08:00
Yuichi Araki
7ae9b2c5a9 am fa07fd94: am c501eb8f: Merge "Initial implementation of NavigationDrawer" into lmp-mr1-ub-dev 
* commit 'fa07fd94fa1e3acb8c77b75fbcf603766dd525c3':
  Initial implementation of NavigationDrawer

GitOrigin-RevId=0653d5d75dd78048ec9db434bd0f969ef7168645

PiperOrigin-RevId: 140545163
 2016-12-09 18:04:51 -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