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

52 Commits

Author SHA1 Message Date
TreeHugger Robot
f212c53ccd Merge "Fix title not showing when AppBarLayout initially collapsed" into nyc-mr1-dev 
GitOrigin-RevId=ea650460b67457efe95675d803b1a08c052efe10

PiperOrigin-RevId: 140564677
 2016-12-12 16:00:02 -08:00
TreeHugger Robot
fb318a293f Merge "Make expanded title bounds start from top of Toolbar" into nyc-mr1-dev 
GitOrigin-RevId=6f828f29f972e4af9e61cc0ae24afc1ef853fa28

PiperOrigin-RevId: 140564672
 2016-12-12 15:59:58 -08:00
Alan Viverette
bc848c0149 Merge "Add @RestrictTo(GROUP_ID) annotations to match @hide docs annotations" into nyc-mr1-dev 
GitOrigin-RevId=e79052ab6ad4db70b84c3c5aa0d7ccf94c743e9d

PiperOrigin-RevId: 140564671
 2016-12-12 15:59:54 -08:00
Aurimas Liutikas
879f65f11f Remove all the extra accessor methods added by javac in support-design. 
am: 657ea1100f

Change-Id: I762e3378d1c7e82139e9f04c3f750324ffd9851c

GitOrigin-RevId=96a3a5a841741fddc3773f35a22e31cded6bbdd8

PiperOrigin-RevId: 140564573
 2016-12-12 15:59:33 -08:00
Aurimas Liutikas
e01d4414d9 Merge "Fix Javadoc method reference in CollapsingToolbarLayout." into nyc-mr1-dev 
GitOrigin-RevId=0c350f7a61259f7313b44eab8190d05454e05963

PiperOrigin-RevId: 140564563
 2016-12-12 15:59:29 -08:00
Chris Banes
ee5bc393c9 Fix CollapsingToolbarLayout not consuming insets 
am: 40c8b62219

Change-Id: I07ff1bcf166693ba43948fd4281729169be9ff5b

GitOrigin-RevId=cc016a74d8ed4ebd67fe5d231be78777ad4f3bf6

PiperOrigin-RevId: 140564542
 2016-12-12 15:59:16 -08:00
Chris Banes
cc00b5169e Fix CTL title not showing sometimes 
am: c3f031d8b3

Change-Id: I5ff2b491d8f4364b3fb256ffc98e7149e9062e20

GitOrigin-RevId=a817e8a13a27837fa02fa6221f692ab963d77cbc

PiperOrigin-RevId: 140564416
 2016-12-12 15:58:21 -08:00
Chris Banes
93d1987738 AppBarLayout + CollapsingToolbarLayout tests fixes 
am: bb3740d273

Change-Id: Idf315788b60e3536563591715ff10570808d113b

GitOrigin-RevId=6dcd2f07828798bf84b1b9486a03d9ac271bf20f

PiperOrigin-RevId: 140564398
 2016-12-12 15:58:13 -08:00
Chris Banes
c79ff658da Merge \"Fix CollapsingToolbarLayout pinned views with insets\" into nyc-support-24.1-dev 
am: 9e55ffc203

Change-Id: I8a4dbb9ee60468ff68024b81e2c4592c46039830

GitOrigin-RevId=497afd753b419ba61f44b548efbf92bb1a4b7375

PiperOrigin-RevId: 140564112
 2016-12-12 15:57:24 -08:00
Chris Banes
fc28a7a905 Merge \"Add disabled support to TextInputLayout\" into nyc-support-24.1-dev 
am: 93bfbc677a

Change-Id: Ie50888c295cfb7ae9f53f4b8371758862302eefc

GitOrigin-RevId=19b449e5b243acede2f373cb88b50974b9ea77e8

PiperOrigin-RevId: 140563834
 2016-12-12 15:56:06 -08:00
Chris Banes
97af0274a6 Merge \"Move FloatingActionButton shadow to use ValueAnimatorCompat\" into nyc-support-24.1-dev 
am: a257f2f1fe

Change-Id: Iaffd880eca0f8a335cd44e111b5f404909196efc

GitOrigin-RevId=3d4e58d39890ddbd46a4d71a8acc78942daf1bed

PiperOrigin-RevId: 140563788
 2016-12-12 15:55:52 -08:00
Chris Banes
3197053f08 Merge \"Fix scrimVisibleHeightTrigger being read as an int\" into nyc-support-24.1-dev 
am: 92d737f25a

Change-Id: I67bea0768733d7d5a3b27642c0810e7b517dfad2

GitOrigin-RevId=eca272e502d47583f6fddd7984596263e5bb60fa

PiperOrigin-RevId: 140563765
 2016-12-12 15:55:48 -08:00
Hyundo Moon
2a9ca4cded Merge remote-tracking branch \'goog/master\' into support_refactor 
am: ca85523e42

Change-Id: Idc4982d02e5f9f6ca6c817ac86e7770ce122ce59

GitOrigin-RevId=9a8aa1ccccda60e31373ff637c3234ad96aa4a1a

PiperOrigin-RevId: 140563737
 2016-12-12 15:55:35 -08:00
Aurimas Liutikas
510a95e760 Back... TO THE FUTURE! 
am: b4586e1ac0

Change-Id: I402cd4135dbbf4d5d4fb0714bc3ba707612f18fb

GitOrigin-RevId=c2b100f3e28e9e478b67b1cd74daecbbf63bb692

PiperOrigin-RevId: 140561156
 2016-12-12 15:55:31 -08:00
Aurimas Liutikas
f95f70e441 Merge "Actually change api to use long in CollapsingToolbarLayout." into nyc-dev 
am: 44e80233cd

* commit '44e80233cd489c516301c00c53b3578b979f4807':
  Actually change api to use long in CollapsingToolbarLayout.

Change-Id: I5bca1636fc12b87837066bdaf2530a59f2eaebfd

GitOrigin-RevId=03745a04ccb67a213083a720e6bdbdedfcae673d

PiperOrigin-RevId: 140561045
 2016-12-12 15:55:18 -08:00
Aurimas Liutikas
9ec4871865 Update CollapsingToolbarLayout API to use long instead of int. 
am: e852801f92

* commit 'e852801f9258e00f89da48918b58a6e933643ab9':
  Update CollapsingToolbarLayout API to use long instead of int.

Change-Id: I3cc2efa3093c7e5e6296af25e9255f12e4f7d9cf

GitOrigin-RevId=f1cde580be7802f84ef0d530a1a3e769be3ea32d

PiperOrigin-RevId: 140561037
 2016-12-12 15:55:14 -08:00
Chris Banes
4218a935b2 Rename design lib layout styleables 
am: c6cbbb50a0

* commit 'c6cbbb50a06ec08e6888bd1c3dfd7fdf588d9db5':
  Rename design lib layout styleables

Change-Id: I40e853457bbc0a3d09c298688c22cefbb77c68c9

GitOrigin-RevId=962b1f17069cfbb9b7994c04484dc44f77ad8282

PiperOrigin-RevId: 140560990
 2016-12-12 15:54:52 -08:00
Chris Banes
daff0d4e5d Merge "More customization methods for CollapsingToolbarLayout" into nyc-dev 
am: 66955d2dab

* commit '66955d2dabd46843d3d70ec3864413b8a7e80a8e':
  More customization methods for CollapsingToolbarLayout

Change-Id: I38d1ec6a1b5484f44b2509cb1ef035886c9ca266

GitOrigin-RevId=3c15f54d5e1ce8d577cc76804ccf0a4ba86d6ced

PiperOrigin-RevId: 140560891
 2016-12-12 15:54:24 -08:00
Chris Banes
a03cca4fb7 Merge "Use StateListAnimator for AppBarLayout elevation changes" into nyc-dev 
GitOrigin-RevId=cb849a71706ac0660a5383c11629bc8d9c1a9f28

PiperOrigin-RevId: 140560610
 2016-12-12 15:53:26 -08:00
Adam Lesinski
ac75324568 Merge "Build support libs with AAPT2" into nyc-dev 
GitOrigin-RevId=cb461c15a1f928b54db6e3972cfabbf559e8b22d

PiperOrigin-RevId: 140560554
 2016-12-12 15:53:22 -08:00
Adam Lesinski
893c70e715 Merge "Revert "Build support libs with AAPT2"" into nyc-dev 
GitOrigin-RevId=bba78041485f18297695b1b4d3f1245453f8b30c

PiperOrigin-RevId: 140560522
 2016-12-12 15:53:14 -08:00
Adam Lesinski
9bbeff1507 Merge "Build support libs with AAPT2" into nyc-dev 
GitOrigin-RevId=920dacfbd0a6d9ca0195439d9baa750aee3230b9

PiperOrigin-RevId: 140560512
 2016-12-12 15:53:09 -08:00
Adam Lesinski
dbc997a218 Revert "Build support libs with AAPT2" 
This reverts commit 0dac8d82e2a249d7c9c42ab259389e11cac15400.

Change-Id: I830fb18162b6eea8dde9e38f9dc39b02449ec846

GitOrigin-RevId=4ac91fa3f14db2f25345595fb921497c11d4e5c0

PiperOrigin-RevId: 140560479
 2016-12-12 15:52:52 -08:00
Adam Lesinski
ecc159f2e4 Build support libs with AAPT2 
Use AAPT2 to build the framework support libraries. Apps built with AAPT2 can more efficiently
link against these libraries by specifying their module name in LOCAL_STATIC_ANDROID_LIBRARIES.

Ex:

LOCAL_STATIC_ANDROID_LIBRARIES := android-support-v7-appcompat android-support-v4

Apps built with AAPT2 do not need to specify --auto-add-overlay or --extra-packages, as these
are automatically added as needed by the build system.

This change will not affect any apps that currently depend on the support libraries.
This is because they import the resources directly.

We use LOCAL_JAR_EXCLUDE_FILES := none only to support javac when building javadoc.
Jack builds are correct because the build system passes in the latest generated R.java
ahead of any previous ones packaged in classes.jack. This means we can dynamically reference
a support lib module, correctly seeing non-final R.java. Then at app package time, we only
include the final R.java generated by the AAPT2 packaging step.

Bug:25958912
Change-Id: I71bff080ff2694aa3df1c8a67d933e2daab0f245

GitOrigin-RevId=0dac8d82e2a249d7c9c42ab259389e11cac15400

PiperOrigin-RevId: 140560475
 2016-12-12 15:52:48 -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
dbb75c008e Merge "Fix window insets for AppBarLayouts in ViewPager" into mnc-ub-dev am: 75fd07ac98 
am: edc47e19cd

* commit 'edc47e19cddd681bffd02103661b7c03db87c2ce':
  Fix window insets for AppBarLayouts in ViewPager

GitOrigin-RevId=31b690241124e22631b9e9f485bc4dbf88254db1

PiperOrigin-RevId: 140559774
 2016-12-12 15:48:10 -08:00
Chris Banes
9b597185ab Merge "Set a callback on CoL\'s status bar background" into mnc-ub-dev am: 9079ab7c6b 
am: b876a299cc

* commit 'b876a299cc3fb4decf1ecf3a5a0d34b342d4b32a':
  Set a callback on CoL's status bar background

GitOrigin-RevId=77eb6a5e7d1b1462bb4f811724cb42d22f189a2f

PiperOrigin-RevId: 140559768
 2016-12-12 15:48:06 -08:00
Chris Banes
23bd862323 Merge "Fix CollapsingToolbarLayout not drawing a title" into mnc-ub-dev am: af862ffe2a 
am: b66d81e110

* commit 'b66d81e110b9056c448a094e3a21734333d665f1':
  Fix CollapsingToolbarLayout not drawing a title

GitOrigin-RevId=070c7139ee671e10e2197d9cad4015b797cd0e9a

PiperOrigin-RevId: 140559540
 2016-12-12 15:46:31 -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
602be1146e Fix CollapsingToolbarLayout.setCollapsedTitleGravity() am: cd7313d4cd 
am: 75eb50cfbb

* commit '75eb50cfbbbc70f9ca9c860db7ae515c9c140cd5':
  Fix CollapsingToolbarLayout.setCollapsedTitleGravity()

GitOrigin-RevId=cb1dff548d640cc7414fd41e9bf0c8302d5e001e

PiperOrigin-RevId: 140551206
 2016-12-12 15:41:59 -08:00
Chris Banes
81ff1336dd resolved conflicts for d687245e to master 
Change-Id: I245e42a399585bd1788db6ba09486ef1c1a6b691

GitOrigin-RevId=c0d908fa15305aa1efe58738c74d54933772186c

PiperOrigin-RevId: 140551108
 2016-12-12 15:41:07 -08:00
Chris Banes
ce2824f39e Merge "Add accessor methods for Toolbar title margins" 
GitOrigin-RevId=2ca24fee9fd3cdba544eb5d55b2b0e37377034fa

PiperOrigin-RevId: 140551085
 2016-12-12 15:40:58 -08:00
Chris Banes
b693c62b6e am c6fccd68: am e667a567: Merge "Use the correct interpolators in the design lib" into mnc-ub-dev 
* commit 'c6fccd6842d28bdedea425ab1e0c947e2e1a41bc':
  Use the correct interpolators in the design lib

GitOrigin-RevId=eda4412df4b985c54913b1ba9dff1ce4d4883cf5

PiperOrigin-RevId: 140550492
 2016-12-12 15:40:34 -08:00
Chris Banes
b5ab60dc9a am c25d71b7: am 756b701d: Merge "Fix CollapsingToolbarLayout when used with SearchView" into mnc-ub-dev 
* commit 'c25d71b7961bb54676a9989b77d9ac4834d5698c':
  Fix CollapsingToolbarLayout when used with SearchView

GitOrigin-RevId=f6cb6956bc3f8af302d222a6534c906f7c67efde

PiperOrigin-RevId: 140550256
 2016-12-12 15:39:44 -08:00
Chris Banes
c3c75f7277 am f2093cd5: am 99e52876: Merge "Improve typeface support in the collapsing text widgets" into mnc-ub-dev 
* commit 'f2093cd5774b9cda59ff146c85cbeb792db65945':
  Improve typeface support in the collapsing text widgets

GitOrigin-RevId=1ff4d4f7470a44dff84f6848d3e2678a7919f594

PiperOrigin-RevId: 140550119
 2016-12-12 15:38:59 -08:00
Chris Banes
bcc48385f7 am d36e64d8: am b1865607: Merge "Fix ABL + CTL not handling being initially collapsed well" into mnc-ub-dev 
* commit 'd36e64d81d2940ddb7f2e2c447622455d5b4eca6':
  Fix ABL + CTL not handling being initially collapsed well

GitOrigin-RevId=1cef72d8a38bf9f897ddb39d6a100f9ee46a76f8

PiperOrigin-RevId: 140549728
 2016-12-12 15:38:08 -08:00
Chris Banes
e8cf5f6678 am 581de875: am 25c8477a: Merge "Improvements around CollapsingToolbarLayout\'s scrims" into mnc-ub-dev 
* commit '581de87570b31ac402eb2be6467227e59c475462':
  Improvements around CollapsingToolbarLayout's scrims

GitOrigin-RevId=8942fdd83bf150fc26e198e1b2dafcbff00e79ef

PiperOrigin-RevId: 140549623
 2016-12-12 15:37:29 -08:00
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
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
2dfb5dcb8a am c5f37b19: am a855043f: am 52c3c45a: am b8d2e466: am f7a85d1c: am 979a9f5a: Merge "Set CollapsingToolbarLayout\'s title from Toolbar" into lmp-mr1-ub-dev 
* commit 'c5f37b199890f3f20c103b8fe2bebf6de61348e3':
  Set CollapsingToolbarLayout's title from Toolbar

GitOrigin-RevId=dee630226ea1959453a9b3705f31d465f03c9e45

PiperOrigin-RevId: 140549354
 2016-12-12 15:36:03 -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
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
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
fd85cc27a5 am c2063e18: am 39e15503: am cdc03eb4: Merge "DesignTime: Compute the size of the collapsed text correctly from start." into mnc-dev 
* commit 'c2063e188ad779fc8672e1cd10281a8b66cda988':
  DesignTime: Compute the size of the collapsed text correctly from start.

GitOrigin-RevId=d93aa96d14039ef51474dfc980b8ca5379686e02

PiperOrigin-RevId: 140548925
 2016-12-09 18:19:47 -08:00
Chris Banes
db024f09c5 am 54933dc7: am 871f7ae0: am 5a27940c: am 1cb0698d: Merge "Improvements to TextInputLayout" into lmp-mr1-ub-dev 
* commit '54933dc742b11f6c2623ea12369719195e6c1bdb':
  Improvements to TextInputLayout

GitOrigin-RevId=2b5f7a8388a2c2de80b33fefd67fae98457efb64

PiperOrigin-RevId: 140548846
 2016-12-09 18:19:03 -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
39a893061c am d70e8e02: Merge "Use the internal ValueAnimatorCompat in other widgets" into lmp-mr1-ub-dev 
* commit 'd70e8e024a94ca0f4c3a1e0ce8a456773393a071':
  Use the internal ValueAnimatorCompat in other widgets

GitOrigin-RevId=437af5a85386de8a75ac68e19db1b00e8e05eb24

PiperOrigin-RevId: 140545919
 2016-12-09 18:14:01 -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