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
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
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
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
Yuichi Araki
582c6d2d0c
Merge "Fix BottomSheetBehavior drag condition" into mnc-ub-dev
...
am: 5eb3e45db9
* commit '5eb3e45db9cb0cdcd20dac450d9408f31ae375c2':
Fix BottomSheetBehavior drag condition
GitOrigin-RevId=c4b238e1a082c985d1354bdb232a657e60bc71f2
PiperOrigin-RevId: 140560219
2016-12-12 15:51:34 -08:00
Chris Banes
85690d34c1
Merge "Add overload for setupWithViewPager()" into nyc-dev
...
GitOrigin-RevId=6da2fc54652547d6bdba7ae1bed46177af2a268d
PiperOrigin-RevId: 140560215
2016-12-12 15:51:30 -08:00
Kirill Grouchnikov
03d235826f
Merge "Adding test scenario for parallax scrolling in AppBarLayout." into nyc-dev
...
GitOrigin-RevId=6f886fe6a4e9fc2d36f92d3542f0ff3a3208cfb9
PiperOrigin-RevId: 140560136
2016-12-12 15:51:05 -08:00
Kirill Grouchnikov
cd37c39b89
Add test for snapping behavior of AppBarLayout
...
Also fix bug for incomplete snapping on older devices.
Bug: 27408006
Change-Id: I47fda88c2d7f1bf5ba230e9f7937b2fd05e72282
GitOrigin-RevId=c530cc115fddab8e1d9645b322424dd45f9ecd0d
PiperOrigin-RevId: 140560121
2016-12-12 15:50:59 -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
e56f48f9c2
Merge "Don't always use window insets in AppBarLayout" into nyc-dev
...
GitOrigin-RevId=35d2c3f6de240d5f154552dbe5c247d0e5607e61
PiperOrigin-RevId: 140560095
2016-12-12 15:50:47 -08:00
Chris Banes
3c6b9a2fed
Merge "Fix FloatingActionButton.setBackgroundTint* not working" into mnc-ub-dev
...
am: 0960724273
* commit '0960724273891c9f7a9e2f2f6397c0389747b36e':
Fix FloatingActionButton.setBackgroundTint* not working
GitOrigin-RevId=0f268e050ac69084f9e00bfb149735239704c101
PiperOrigin-RevId: 140560089
2016-12-12 15:50:43 -08:00
Yuichi Araki
19b779cce7
Merge "Fix idling resource in swipe test" into mnc-ub-dev
...
am: 1f09d40c1f
* commit '1f09d40c1f3acf471986affd6117857c719ec07a':
Fix idling resource in swipe test
GitOrigin-RevId=be4665eec16e9158dce5316f9d0a3a9e3cec8f05
PiperOrigin-RevId: 140560080
2016-12-12 15:50:38 -08:00
Chris Banes
d0492a847d
Merge "Tidy up TextInputLayout.setError()" into nyc-dev
...
GitOrigin-RevId=a3f9d4d786427afc96bc48bebd9304c56d41a7c3
PiperOrigin-RevId: 140560069
2016-12-12 15:50:26 -08:00
Chris Banes
6dad4607e8
resolve merge conflicts of c16e4c6eec to nyc-dev
...
Change-Id: Ic309b7bbeb3c89e4e73f09b5806b566d004e0250
GitOrigin-RevId=84549395ed3e2ec0453f7349716a12eab9901703
PiperOrigin-RevId: 140560055
2016-12-12 15:50:18 -08:00
Chris Banes
06d44377be
Fix FAB and background attrs again
...
am: d95e0bb027
* commit 'd95e0bb0271ae59387dd9d2ca402ad6f39d789d2':
Fix FAB and background attrs again
GitOrigin-RevId=ccfe45bc4d8090bc9283f3d8dcbfc5497da273e8
PiperOrigin-RevId: 140560026
2016-12-12 15:49:58 -08:00
Chris Banes
0e1d9c47de
Merge "Make TabLayout scroll to the current ViewPager page" into nyc-dev
...
GitOrigin-RevId=b878a92b54fd2c0c05bbf2a7fe45592bfaaf02de
PiperOrigin-RevId: 140559984
2016-12-12 15:49:44 -08:00
Chris Banes
95fe9803b0
Merge "Nested scroll over clickable items on BottomSheet" into mnc-ub-dev
...
am: 8feab4189f
* commit '8feab4189ff169a7d954ceb77ca901760134a8fc':
Nested scroll over clickable items on BottomSheet
GitOrigin-RevId=f5b7c33391e9c8191bb4db7091be1c076a2fa7ea
PiperOrigin-RevId: 140559983
2016-12-12 15:49:40 -08:00
Kirill Grouchnikov
644452d2ce
Merge "Adding CoordinatorLayout tests for scrolling / pinning tabs." into nyc-dev
...
GitOrigin-RevId=ecad73bf7dfd67a3a78b9610d76719b794926010
PiperOrigin-RevId: 140559957
2016-12-12 15:49:24 -08:00
Kirill Grouchnikov
3cbd4c73e1
Merge "Testing FAB anchoring with AppBarLayout" into nyc-dev
...
GitOrigin-RevId=65029163d2263348e4d8db5f371d7de7b621f6d8
PiperOrigin-RevId: 140559940
2016-12-12 15:49:11 -08:00
Kirill Grouchnikov
0ac5cbe3be
Merge "Additional tests for configuring Behavior in CoordinatorLayout." into nyc-dev
...
GitOrigin-RevId=fa0b2ad17dd14b1676457c6bc0a1add13c898744
PiperOrigin-RevId: 140559933
2016-12-12 15:49:07 -08:00
Kirill Grouchnikov
9d65cf8604
Merge "Tests for CoordinatorLayout scrolling / pinning." into nyc-dev
...
GitOrigin-RevId=7e4c2935f0062410c149470825105c03f5efbd54
PiperOrigin-RevId: 140559927
2016-12-12 15:49:02 -08:00
Kirill Grouchnikov
8191b090ca
Merge "More predictable Snackbar tests." into nyc-dev
...
GitOrigin-RevId=0488adbfe4a04e985675ee9f2c92dc680ea9a9d0
PiperOrigin-RevId: 140559910
2016-12-12 15:48:58 -08:00
Aurimas Liutikas
06a0b0ad66
Merge "Fix a description of a ViewPagerAction for tests." into nyc-dev
...
GitOrigin-RevId=cc27bac2d89ec66f0ff724c559780694998b5cb7
PiperOrigin-RevId: 140559902
2016-12-12 15:48:54 -08:00
Chris Banes
9157c3ab13
Merge "Fix testInflateTabLayoutWithNonTabItem on M+" into mnc-ub-dev
...
am: ac8501d7a3
* commit 'ac8501d7a3a3312bd9484396c238524c9a117cfa':
Fix testInflateTabLayoutWithNonTabItem on M+
GitOrigin-RevId=34be0a1b8b8807ee2e4b53e42f3123332d8b4c55
PiperOrigin-RevId: 140559891
2016-12-12 15:48:50 -08:00
Kirill Grouchnikov
4c7a15eea9
Merge "First pass for testing anchoring of views in CoordinatorLayout." into nyc-dev
...
GitOrigin-RevId=3aaa5c1ee6b0e48d0ede2a4a6dc9b519ccec1827
PiperOrigin-RevId: 140559876
2016-12-12 15:48:42 -08:00
Kirill Grouchnikov
01a0a7d756
Merge "Expanding test coverage for Snackbar" into nyc-dev
...
GitOrigin-RevId=3af63c3c6f408da963a41a8a0a5179850461087c
PiperOrigin-RevId: 140559854
2016-12-12 15:48:37 -08:00
Kirill Grouchnikov
2a15110cc4
Align Snackbar test with current guidelines
...
* Naming of activity and test classes
* Using Mockito for listener-related logic
Change-Id: Icf21f4c43437f0db66cd31e3e0c347715987669a
GitOrigin-RevId=7b7e3bfd940aa1b41497ac4c6710a97b54c3e551
PiperOrigin-RevId: 140559830
2016-12-12 15:48:34 -08:00
Aurimas Liutikas
d9042518a3
Merge "Set activity enter and exit transitions to be no animation." into nyc-dev
...
GitOrigin-RevId=f2c1367e866e7da4c7776a4f3368984a77c64851
PiperOrigin-RevId: 140559827
2016-12-12 15:48:30 -08:00
Yuichi Araki
1d79116208
Merge "Fix BottomSheetBehaviorTest on Gingerbread" into mnc-ub-dev am: 07b044cb62
...
am: 89b671f9b7
* commit '89b671f9b7306f77351970f53a913404fc678282':
Fix BottomSheetBehaviorTest on Gingerbread
GitOrigin-RevId=2896f85fe75a12fdde76ac8f325d10d2329e0ff3
PiperOrigin-RevId: 140559720
2016-12-12 15:47:53 -08:00
Kirill Grouchnikov
3b761d62d2
Use Mockito for verifying that a listener has been called. am: 8cf1dce2d2
...
am: 7aec4ef1bf
* commit '7aec4ef1bfc34dad7863b33301fecd58df908693':
Use Mockito for verifying that a listener has been called.
GitOrigin-RevId=f9956872843d264ee5055fa07168effb83ccf154
PiperOrigin-RevId: 140559699
2016-12-12 15:47:45 -08:00
Kirill Grouchnikov
57754d6065
Merge "Test coverage for NavigationView action layouts." into mnc-ub-dev am: c10de2da0b
...
am: d2828e9df6
* commit 'd2828e9df6d96c3ae3a4181d2b393cef3ab7a941':
Test coverage for NavigationView action layouts.
GitOrigin-RevId=9e3135ecc2ee7036a9a10ff6b179ec4427f830c0
PiperOrigin-RevId: 140559651
2016-12-12 15:47:28 -08:00
Kirill Grouchnikov
14bc6c6ae3
Merge "Switch to more reliable icon sources for tinting tests." into mnc-ub-dev am: 5e628496bf
...
am: ab4a92a859
* commit 'ab4a92a859df9587126ef5e84fce85ab3e65f1ba':
Switch to more reliable icon sources for tinting tests.
GitOrigin-RevId=c9e20a7549692123f33c6b4e62d1057cb8f79237
PiperOrigin-RevId: 140559645
2016-12-12 15:47:24 -08:00
Kirill Grouchnikov
c74a717b23
Merge "More tests for NavigationView" into mnc-ub-dev am: 0e6979b1ea
...
am: cb30b29c7a
* commit 'cb30b29c7ac17524d111192d4781e3b44209572e':
More tests for NavigationView
GitOrigin-RevId=d554827274618b9812620b96b8bab6750f53b96b
PiperOrigin-RevId: 140559629
2016-12-12 15:47:12 -08:00
Kirill Grouchnikov
f6afb6a89f
Testing appearance-related APIs on NavigationView. am: 8ea47e618b
...
am: 36a3b04bea
* commit '36a3b04bea73084d2f5d4e9e69acc492b2c86f18':
Testing appearance-related APIs on NavigationView.
GitOrigin-RevId=9ae5a4609b36b200f1b9580dc0c2050186a5a94d
PiperOrigin-RevId: 140559621
2016-12-12 15:47:08 -08:00
Kirill Grouchnikov
cef9ce4b1a
Merge "Initial setup and basic test for NavigationView" into mnc-ub-dev am: c841e91fb5
...
am: 4d3e8a1b07
* commit '4d3e8a1b0784ac4e8de97b8e8ccea7fd9c05e501':
Initial setup and basic test for NavigationView
GitOrigin-RevId=81b6818302d4237a577a886a6e431414e72d79a3
PiperOrigin-RevId: 140559606
2016-12-12 15:46:59 -08:00
Kirill Grouchnikov
ac3c2581c6
Merge "Switch Design tests to activity rules." into mnc-ub-dev am: 3de1aed87d
...
am: ddf334c8c3
* commit 'ddf334c8c30c2cac6aafd5bff49b320d6053620d':
Switch Design tests to activity rules.
GitOrigin-RevId=192d7088cf88241a1e61fee3b76cb06aa5c6e1e8
PiperOrigin-RevId: 140559602
2016-12-12 15:46:55 -08:00
Yuichi Araki
88ac9e46e7
Merge "Bottom sheets ignore touch events when invisible" into mnc-ub-dev am: 7061f1c4b9
...
am: 3be6bbdb46
* commit '3be6bbdb46deaf0708eb4de5002c8e77fa9ab756':
Bottom sheets ignore touch events when invisible
GitOrigin-RevId=bc90647d8b4897b7530b31942bb9b6e3695bf0f7
PiperOrigin-RevId: 140559584
2016-12-12 15:46:51 -08:00
Yuichi Araki
7e2cd243f9
Merge "Fix BottomSheetBehaviorTest" into mnc-ub-dev am: aeac66ab70
...
am: 4d2348182e
* commit '4d2348182e578284fcfd35c43bcb8852f45967c9':
Fix BottomSheetBehaviorTest
GitOrigin-RevId=6027352a976254c5fa31ce0501f7444cc9055dc6
PiperOrigin-RevId: 140559579
2016-12-12 15:46:47 -08:00
Yuichi Araki
7e0ed72327
Merge "BottomSheetBehavior passes View to callbacks" into mnc-ub-dev am: b4a1c82a4a
...
am: 98f6659182
* commit '98f6659182932abc6b058a2cbea12ed4432e45a4':
BottomSheetBehavior passes View to callbacks
GitOrigin-RevId=ecba4ce7908e34fdf6657de086525b7fd5dd3f67
PiperOrigin-RevId: 140559577
2016-12-12 15:46:43 -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
5f2d1bb827
Merge "Fix Snackbar tests when animations are enabled" into mnc-ub-dev am: 5b5ab38cdf
...
am: 120b623fd2
* commit '120b623fd24e5ebb94b7059d514d4ae8bb0a7600':
Fix Snackbar tests when animations are enabled
GitOrigin-RevId=424d9b914f459ad48631d7762c4e133f11f45c34
PiperOrigin-RevId: 140559533
2016-12-12 15:46:27 -08:00
Yuichi Araki
1e796be102
Merge "Add tests for BottomSheet" into mnc-ub-dev am: ad80081fb5
...
am: 6f2b0eea31
* commit '6f2b0eea314dfe152a58d8ebfb0ec899d40f151a':
Add tests for BottomSheet
GitOrigin-RevId=25d185365d320250122658b94df2aab882965689
PiperOrigin-RevId: 140559526
2016-12-12 15:46:23 -08:00
Chris Banes
25622fbef9
Merge "Update test dependencies in AppCompat + design" into mnc-ub-dev am: 3872d0b805
...
am: bf7aa00c7a
* commit 'bf7aa00c7a06c17f8474a85a2806970356944cc8':
Update test dependencies in AppCompat + design
GitOrigin-RevId=a5faff7522a0fd91ea11d77f6a063d6323ba9e7b
PiperOrigin-RevId: 140559517
2016-12-12 15:46:15 -08:00
Kirill Grouchnikov
cefb4ef670
Suppress Javadocs generation in design/tests am: 40b6e9cdd8
...
am: 93e2d21a17
* commit '93e2d21a172bfba09d08e875b45e20bc24d56f86':
Suppress Javadocs generation in design/tests
GitOrigin-RevId=5624edeb9d5b8f471c82f6b824613d0c0907c072
PiperOrigin-RevId: 140559483
2016-12-12 15:45:57 -08:00
Chris Banes
90bf1a4a85
Merge "Fix Snackbar callback being called twice on API 14/15" into mnc-ub-dev am: 9264b12f53
...
am: 32aeb4fbee
* commit '32aeb4fbee8e7dc0cd5424d9e64e068e897e5281':
Fix Snackbar callback being called twice on API 14/15
GitOrigin-RevId=0595eabfc590375a245f4622716290d3dac8fa01
PiperOrigin-RevId: 140559479
2016-12-12 15:45:53 -08:00
Kirill Grouchnikov
dc0b45480b
Merge "Add missing test for min/max tab width limitation in TabLayout" into mnc-ub-dev am: bf5c215e80
...
am: e196deddcc
* commit 'e196deddccbf73fae53ffe63ec101aa4ff06996c':
Add missing test for min/max tab width limitation in TabLayout
GitOrigin-RevId=0ab16dda7d0006ace468e4138a526e18249ae6ef
PiperOrigin-RevId: 140559466
2016-12-12 15:45:36 -08:00
Kirill Grouchnikov
4884403741
Merge "Third pass for testing TabLayout with ViewPager" into mnc-ub-dev am: 751d0361f1
...
am: 6b09720a5e
* commit '6b09720a5ee0ab11d22a973e5d7d981e482cd77f':
Third pass for testing TabLayout with ViewPager
GitOrigin-RevId=b6583d431d89eecd4b53e069590f38ab42211c53
PiperOrigin-RevId: 140559462
2016-12-12 15:45:32 -08:00