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

Fix CollapsingToolbarLayout tests

Browse Source 
am: b539fd5711

Change-Id: Ida0b5a86948aaac6d010660275c4bd6a45d380db

GitOrigin-RevId=61b3959efb64d18358645762023abf36cec2cc53

PiperOrigin-RevId: 140564437
This commit is contained in:
Chris Banes 2016-11-30 05:07:57 +00:00 committed by Travis Collins
parent cc00b5169e
commit 7ae0f4523b
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/res/values/dimens.xml
View File

@ -26,7 +26,7 @@
<dimen name="drawable_medium_size">16dip</dimen>
<dimen name="drawable_large_size">20dip</dimen>
<dimen name="appbar_height">192dip</dimen>
<dimen name="appbar_height">160dip</dimen>
<dimen name="fab_margin">32dip</dimen>
<dimen name="fab_mini_height">40dp</dimen>

5
tests/src/android/support/design/widget/AppBarWithCollapsingToolbarTest.java
View File

@ -159,11 +159,12 @@ public class AppBarWithCollapsingToolbarTest extends AppBarLayoutBaseTest {
assertAppBarElevation(0f);
// Perform a swipe-up gesture across the horizontal center of the screen.
// Perform a swipe-up gesture across the horizontal center of the screen, starting from
// just below the AppBarLayout
performVerticalSwipeUpGesture(
R.id.coordinator_layout,
centerX,
originalAppbarBottom + longSwipeAmount / 2,
originalAppbarBottom + 20,
longSwipeAmount);
mAppBar.getLocationOnScreen(appbarOnScreenXY);

10
tests/src/android/support/design/widget/AppBarWithToolbarAndTabsTest.java
View File

@ -64,11 +64,12 @@ public class AppBarWithToolbarAndTabsTest extends AppBarLayoutBaseTest {
final int longSwipeAmount = 3 * appbarHeight / 2;
final int shortSwipeAmount = toolbarHeight;
// Perform a swipe-up gesture across the horizontal center of the screen.
// Perform a swipe-up gesture across the horizontal center of the screen, starting from
// just below the AppBarLayout
performVerticalSwipeUpGesture(
R.id.coordinator_layout,
centerX,
originalAppbarBottom + 3 * longSwipeAmount / 2,
originalAppbarBottom + 20,
longSwipeAmount);
mAppBar.getLocationOnScreen(appbarOnScreenXY);
@ -156,11 +157,12 @@ public class AppBarWithToolbarAndTabsTest extends AppBarLayoutBaseTest {
final int longSwipeAmount = 3 * appbarHeight / 2;
final int shortSwipeAmount = toolbarHeight;
// Perform a swipe-up gesture across the horizontal center of the screen.
// Perform a swipe-up gesture across the horizontal center of the screen, starting from
// just below the AppBarLayout
performVerticalSwipeUpGesture(
R.id.coordinator_layout,
centerX,
originalAppbarBottom + 3 * longSwipeAmount / 2,
originalAppbarBottom + 20,
longSwipeAmount);
mAppBar.getLocationOnScreen(appbarOnScreenXY);