14 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
af5540b63a Merge "Initial test setup and simple TabLayout test in design lib" into mnc-ub-dev am: 6f15897288
am: 4d810ce4e3

* commit '4d810ce4e33047ec8f602f10134e673c2ff70736':
  Initial test setup and simple TabLayout test in design lib

GitOrigin-RevId=50e02b9aeae54e15e9278116863688a6623dde27

PiperOrigin-RevId: 140559421
2016-12-12 15:45:16 -08:00