Chris Banes
aee43328f2
Merge "Fix for AppBarLayout\'s scrolling view not laying out WIP" into nyc-dev
...
am: 95c069158d
* commit '95c069158d8fa777c4f930dad27c2a6ac59ec741':
Fix for AppBarLayout's scrolling view not laying out WIP
Change-Id: I42c75bc97bf73e2c1047f7d834a2431dfda5c905
GitOrigin-RevId=2400816160739eb13b55a91f790df19d8a267d10
PiperOrigin-RevId: 140561031
2016-12-12 15:55:10 -08:00
Yuichi Araki
bfe05a65b3
Update APIs for behavior_skipCollapsed
...
am: 3fa74e0b52
* commit '3fa74e0b52bb13010ba5f77c5b155fd86ecc2dcd':
Update APIs for behavior_skipCollapsed
Change-Id: I2cd18331d72ed7504b7abb0ad52a19b2da7f0e65
GitOrigin-RevId=41b7802bd926b722e18ca7a3c41a8128af7a52e2
PiperOrigin-RevId: 140561018
2016-12-12 15:55:05 -08:00
Yuichi Araki
1e530b877c
Add behavior_skipCollapsed for bottom sheet
...
am: 362585b01e
* commit '362585b01e5ca19d1c58e4b152ad0a863b5f6d91':
Add behavior_skipCollapsed for bottom sheet
Change-Id: I549272e7db34c40d36a9c4a23f4c51c9e0c8b050
GitOrigin-RevId=c5ce2cafd7e5673f8e24cf658003c2b41c6647bb
PiperOrigin-RevId: 140561012
2016-12-12 15:55:00 -08:00
Chris Banes
9687636496
Design lib styleables rename pt.2
...
am: 73e7a06fb6
* commit '73e7a06fb66110495fa4e98a91831a47feab2526':
Design lib styleables rename pt.2
Change-Id: I90868e9b185b4937a0ef152d60434714f53ab115
GitOrigin-RevId=ad96d7fa2a1982f2ab472e6b4b6bc8b17f8f740a
PiperOrigin-RevId: 140560997
2016-12-12 15:54:56 -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
bad61c1f90
Merge "Fix TabLayout long click Toast placement" into nyc-dev
...
am: db0eb650fb
* commit 'db0eb650fb842982333c66d6ef3e982a0ec9f58d':
Fix TabLayout long click Toast placement
Change-Id: Ie073d29dcaaae37a8909d565896e457997f8eeeb
GitOrigin-RevId=98e784a559026c42473bf8f07f4d83233acf4f51
PiperOrigin-RevId: 140560955
2016-12-12 15:54:48 -08:00
Chris Banes
dca89bbcb6
Merge "TabLayout + ViewPager improvements" into nyc-dev
...
am: 00559e3
* commit '00559e360cf4cf7858d4bd5ddb874b85fad6e9cb':
TabLayout + ViewPager improvements
Change-Id: I0702b333d9faf543d67625398042951f7d4724a2
GitOrigin-RevId=578d01a5f73da0a3c4be5122010b5fbfba92b5be
PiperOrigin-RevId: 140560932
2016-12-12 15:54:44 -08:00
Chris Banes
84957bb76e
Backport AbsSavedState and fixes to v4
...
am: 05f5ba0
* commit '05f5ba020fa6caa658c75b6d77436aa980ca0fcc':
Backport AbsSavedState and fixes to v4
Change-Id: I8b6aa1e7d0243d1d1a1c8ef16c8fb7def35f4b1f
GitOrigin-RevId=06390c6c97fee4976fb7b8bf308b4512338c64c3
PiperOrigin-RevId: 140560918
2016-12-12 15:54:40 -08:00
Chris Banes
5116a4da25
Merge "Fix TextInputLayout not clearing the error on Lollipop" into mnc-ub-dev am: 8bab339
...
am: ac23e76
* commit 'ac23e764c991f2e72cd1b4c54a7ffa72024e94d7':
Fix TextInputLayout not clearing the error on Lollipop
Change-Id: I676fdb29773258ba84a0cb6a9cdd6fe029d2ec2f
GitOrigin-RevId=d374743e9db623153997cf59efc9658c678d08bf
PiperOrigin-RevId: 140560912
2016-12-12 15:54:36 -08:00
Chris Banes
451a0f4239
Merge "Tweak AppBarLayout scroll duration" into nyc-dev
...
am: 376088d
* commit '376088d3bb0913a0ebf4ccbe43688a1f61c656fa':
Tweak AppBarLayout scroll duration
Change-Id: Ie73e94ccf1600de818e8ba1e048cfe6cb94f79df
GitOrigin-RevId=72620dc2126718b8bfd98252ba26fc9e9233544e
PiperOrigin-RevId: 140560906
2016-12-12 15:54:32 -08:00
Adam Powell
575316377d
Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev
...
am: 9fa2191
* commit '9fa21910ab73610aded5af84fd488fb91cd06c4e':
Remove dependencies on Activity from common Fragment superclasses
Change-Id: Ib26f6b384e81e408189cee0848835a0c573a15b5
GitOrigin-RevId=2b19308135a214ac786886e14cbe0f4c52a03982
PiperOrigin-RevId: 140560900
2016-12-12 15:54:28 -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
32fadf4283
Fix fast subsequent TextInputLayout.setError() calls am: 7d1f61a17d
...
am: b695a48287
* commit 'b695a482875ea28cc622e226da4987d395aa1029':
Fix fast subsequent TextInputLayout.setError() calls
Change-Id: Ic171d46e9134f5db30a88ec81867b8dfafe121f7
GitOrigin-RevId=04e35daf842a24cfccd833f67f3e471d4e86138b
PiperOrigin-RevId: 140560872
2016-12-12 15:54:20 -08:00
Chris Banes
c08b1b579c
Merge "Expose both Behavior constructors in FloatingActionButton" into nyc-dev
...
am: 5737990
* commit '5737990debd8a97dfe29800d6cd1b6d9347adfbb':
Expose both Behavior constructors in FloatingActionButton
Change-Id: Ib2792954d92be1348f0911bf7c91c331812379b4
GitOrigin-RevId=e2d943a97669882cfe9eeb434ce05cab68bcc9ed
PiperOrigin-RevId: 140560845
2016-12-12 15:54:16 -08:00
Chris Banes
6d659228e0
Merge "Make snap with enterAlways|enterAlwaysCollapsed" into mnc-ub-dev am: fb2e1f1
...
am: b9b83cc
* commit 'b9b83cc0804c30479c8a9efdefce9ee5d0b0a92c':
Make snap with enterAlways|enterAlwaysCollapsed
Change-Id: I089191dd7627c2af9729da759946c0bdc4b2de3d
GitOrigin-RevId=2d1ed7866caccbb9e7cf171b1ad9c731638f3059
PiperOrigin-RevId: 140560815
2016-12-12 15:54:12 -08:00
Yuichi Araki
a29f156016
Merge "Let touch events fall through from bottom sheet" into mnc-ub-dev am: 3126939
...
am: 674b11a
* commit '674b11a68aa97f156d3606e110ebceeb1bedf0b4':
Let touch events fall through from bottom sheet
Change-Id: Ia348bd4a5abb5a3f9c8a50bd2106984a6910de7b
GitOrigin-RevId=74cdfd75ee57aad1017f8e274eb4e6624a7b88c0
PiperOrigin-RevId: 140560806
2016-12-12 15:54:08 -08:00
Chris Banes
cbb711b39b
Fix build again
...
Change-Id: Ie6bec6479268478b00abfa186e0e5a6bd56a0aba
GitOrigin-RevId=2dfbb6cd636edb037eefe74fc30fbcf47f508a7c
PiperOrigin-RevId: 140560756
2016-12-12 15:54:04 -08:00
Chris Banes
649c66abeb
Fix build for FloatingActionButton
...
Change-Id: Ie87f7dcd3615b8c72d6a8165c441678b8cb98fcb
GitOrigin-RevId=9cf7823a2b044e550dd5c1ba3a7a91d45b4d9673
PiperOrigin-RevId: 140560749
2016-12-12 15:53:59 -08:00
Chris Banes
7ad217bcca
Merge "Fix the FAB not returning when animations are disabled" into mnc-ub-dev
...
am: 5ecac86
* commit '5ecac8623018236e9f15385cade2c7ea59829f2e':
Fix the FAB not returning when animations are disabled
Change-Id: I90e399cbb1becfa3577145535ee5b9048d646efb
GitOrigin-RevId=1de702ffd1244435005aab3c4ce132c54f40fefa
PiperOrigin-RevId: 140560742
2016-12-12 15:53:55 -08:00
Chris Banes
ff6063c1db
Fix SDK int check in TextInputLayout
...
am: bdb210a
* commit 'bdb210a52ce1966368f534253822f15a8591a74f':
Fix SDK int check in TextInputLayout
Change-Id: I9a59cb7994f422c838a44ed4311da459d0f75203
GitOrigin-RevId=ebb9b8cfda9e643d77e3bf15ed10efd2ae55227e
PiperOrigin-RevId: 140560726
2016-12-12 15:53:51 -08:00
Ryan Lothian
5148bbcbd0
Merge "Revert "TabLayout + ViewPager improvements"" into nyc-dev
...
GitOrigin-RevId=335da996682889d7eb3ba030dd48eed383726254
PiperOrigin-RevId: 140560722
2016-12-12 15:53:46 -08:00
Chris Banes
982940f4d8
Merge "TabLayout + ViewPager improvements" into nyc-dev
...
GitOrigin-RevId=641460fbf3bc54026e6dc561dc35224e0aa02a4a
PiperOrigin-RevId: 140560715
2016-12-12 15:53:42 -08:00
Chris Banes
3001c3bc54
Merge "Enable automatic FAB show/hide to work without minHeight" into nyc-dev
...
GitOrigin-RevId=efc00e96d5cf3bf42c5b2620284e80c9febc169a
PiperOrigin-RevId: 140560698
2016-12-12 15:53:38 -08:00
Chris Banes
862b4a361d
Merge "Fix TabLayout text size issue" into nyc-dev
...
GitOrigin-RevId=801fc37fd34d31fdb2b0e943f1c6eef5067a827f
PiperOrigin-RevId: 140560665
2016-12-12 15:53:34 -08:00
Chris Banes
ec299a489a
Fix design support lib docs build
...
Change-Id: Ifde9b6a5a01699c802e6d6c541ac827e0a1c5332
GitOrigin-RevId=926cd28257536b1206934d69585a2dab100147d5
PiperOrigin-RevId: 140560632
2016-12-12 15:53:30 -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
Chris Banes
13bde7fd12
Merge "Fix FAB + Snackbar stacking with hidden FAB" into nyc-dev
...
GitOrigin-RevId=dbe6c3f955b18301236f0aa21c67a1f7ccfb702d
PiperOrigin-RevId: 140560542
2016-12-12 15:53:18 -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
Aurimas Liutikas
09e81bd6fe
Merge "Fix multi-pointer behavior for Snackbar." into mnc-ub-dev
...
am: 1315db6
* commit '1315db63b39219f4a3ff87200c2bbc27f27667a2':
Fix multi-pointer behavior for Snackbar.
Change-Id: Ia8ba7ec9a0add689e954ba183a6e183bd88016ce
GitOrigin-RevId=c1e2e3be85de2fecb6ab45f593832d94b47b576e
PiperOrigin-RevId: 140560500
2016-12-12 15:53:04 -08:00
Chris Banes
86cbc614f6
Merge "Add workaround for invalidation bug on API 21-22" into mnc-ub-dev
...
am: 0799afc
* commit '0799afc163bd5d8f9bfd6869e451c4be5640c971':
Add workaround for invalidation bug on API 21-22
Change-Id: Ib1450fdbc7832b158464e6603177faa11720500a
GitOrigin-RevId=b21b5491bcd540843e1d6fe0fdaaddd03d2c5165
PiperOrigin-RevId: 140560484
2016-12-12 15:53:00 -08:00
Chris Banes
e0d66731a8
Merge "Allow AppBarLayout to be taller than CoordinatorLayout" into mnc-ub-dev
...
am: f72a8be
* commit 'f72a8bec72c6ccb0b6e5df45d444e96b0d77c0d9':
Allow AppBarLayout to be taller than CoordinatorLayout
Change-Id: If1cb6d0a41d58411265da510a9e374a7817509ac
GitOrigin-RevId=a2f7210e7a307d65830847cf2179b05e9099ee13
PiperOrigin-RevId: 140560482
2016-12-12 15:52:56 -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
Yuichi Araki
e89eec227d
Merge "Fix layout when BottomSheet is moving" into nyc-dev
...
GitOrigin-RevId=1d321c85887197738dca2465b679c5258756b9a2
PiperOrigin-RevId: 140560468
2016-12-12 15:52:44 -08:00
Yuichi Araki
dce18cd5dc
Merge "Fix setState with the current state" into mnc-ub-dev
...
am: c5f5f85
* commit 'c5f5f85c1323787b2dc692af2dbd3efc804d5034':
Fix setState with the current state
Change-Id: Ifbbadcb2f888adcfe29b776a3ab363e88fbe6885
GitOrigin-RevId=4f0c8201b8c02def322843f180b86e0ea466e650
PiperOrigin-RevId: 140560466
2016-12-12 15:52:40 -08:00
Chris Banes
d26cc78b39
Merge "Use the EditText\'s gravity for TextInputLayout" into mnc-ub-dev
...
am: 0c098da
* commit '0c098da66d0c9c2566d5353fd4a38cd8a2d9a9d7':
Use the EditText's gravity for TextInputLayout
GitOrigin-RevId=2b84e6781ea06c6139bbeab062f1248d3819fcc7
PiperOrigin-RevId: 140560453
2016-12-12 15:52:36 -08:00
Yuichi Araki
7afa2a32d3
Merge "BottomSheetBehavior#setState before layout" into mnc-ub-dev
...
am: 9203384
* commit '9203384c85914e13350d72a0111d6eab1551aad0':
BottomSheetBehavior#setState before layout
GitOrigin-RevId=a5c4f9fb6b571c6694b2d996ccd89d9c9cf06cf0
PiperOrigin-RevId: 140560447
2016-12-12 15:52:32 -08:00
Taeho Kim
d9eccb5225
Merge "Fix NPE when calling setState() before onLayoutChild()" into mnc-ub-dev
...
am: 93978d0
* commit '93978d066bab7f16175573c1b58c5449284fad6d':
Fix NPE when calling setState() before onLayoutChild()
GitOrigin-RevId=2d72783642304f1397b9740359594d26c11ada3f
PiperOrigin-RevId: 140560442
2016-12-12 15:52:28 -08:00
Chris Banes
d09f67fab2
Fix FloatingActionButton doc build
...
Change-Id: Ia1becbc40d7dfac61fd88ea16da4fbe149fc8c68
GitOrigin-RevId=56f0ad8d4fa234d2801971042ff1d71aba960e37
PiperOrigin-RevId: 140560428
2016-12-12 15:52:24 -08:00
Chris Banes
0dd6fc7b1e
Merge "Fix TextInputLayout clearing the EditText tint" into mnc-ub-dev
...
am: 403e480
* commit '403e4802cae0b5354cac650f26e1a4f5e74b696c':
Fix TextInputLayout clearing the EditText tint
GitOrigin-RevId=5b52850af5eb41669b8b741518d316b40be9d676
PiperOrigin-RevId: 140560422
2016-12-12 15:52:20 -08:00
Chris Banes
638d6ab685
Merge "Don\'t call requestDisallowInterceptTouchEvent(false)" into mnc-ub-dev
...
am: bed7de3
* commit 'bed7de3603499da7577e50ae70c2369dca9d2a55':
Don't call requestDisallowInterceptTouchEvent(false)
GitOrigin-RevId=65a1c00240675067047b3ef23d5c1ecca1a6ab22
PiperOrigin-RevId: 140560416
2016-12-12 15:52:16 -08:00
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
3019804e6f
Merge "BottomSheetBehavior now handles fitsSystemWindows" into mnc-ub-dev
...
am: 29bbfda
* commit '29bbfdab23a202edb76fe87897f6e3b8a7c2d131':
BottomSheetBehavior now handles fitsSystemWindows
GitOrigin-RevId=2d42022740a6d622d6f7d1ccca7b91b90eb63d28
PiperOrigin-RevId: 140560406
2016-12-12 15:52:08 -08:00
Chris Banes
3d94665430
Merge "Fix AppBarLayout enterAlwaysCollapsed with inset window" into mnc-ub-dev
...
am: 6002db9
* commit '6002db956d178d96f755f70826b92f24405de65b':
Fix AppBarLayout enterAlwaysCollapsed with inset window
GitOrigin-RevId=18dee0438f1e5b61da88275e769376a68994d766
PiperOrigin-RevId: 140560263
2016-12-12 15:52:02 -08:00
Chris Banes
14425b5298
Merge "Disable Snackbar animations if necessary" into mnc-ub-dev
...
am: 3b591d5
* commit '3b591d566e2242881b149bc43d60dc4cbd374392':
Disable Snackbar animations if necessary
GitOrigin-RevId=12113fa03c02662190617538e3e11d7aaa705654
PiperOrigin-RevId: 140560260
2016-12-12 15:51:58 -08:00
Kirill Grouchnikov
b614838d8d
mutate() the background of TextInputLayout's editor on changes.
...
Otherwise the currently tinted background will be used for the next
inflated TextInputLayout.
Bug: 27694398
Change-Id: I6772ab9b58e98675f7b9535d54ef30001d8b3df4
GitOrigin-RevId=0f6a807ceaa96930e57e55826ddaae5eab692aa8
PiperOrigin-RevId: 140560259
2016-12-12 15:51:54 -08:00
Kirill Grouchnikov
55d5777625
Merge "Integration tests covering anchoring with margins in CoL." into nyc-dev
...
GitOrigin-RevId=b893459a2e916cc957e7a638e9afdb4a1aca3c78
PiperOrigin-RevId: 140560254
2016-12-12 15:51:50 -08:00
Kirill Grouchnikov
2d2074372d
Merge "Fix selection state for custom views on TabLayout" into nyc-dev
...
GitOrigin-RevId=5034e5a407b4b7014e1dc9b09accb99f8a5b0a8d
PiperOrigin-RevId: 140560244
2016-12-12 15:51:46 -08:00