diff options
| author | Chris Craik <ccraik@google.com> | 2016-03-02 18:52:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-02 18:52:35 +0000 |
| commit | b67985f337e1592f621e1b85f525098887804ccd (patch) | |
| tree | fb73aa42cc5c678f1922a7efe971a3701ed9e0a7 /tests | |
| parent | b4672ef6dfbaf416981539d515ad1489d7d0bc87 (diff) | |
| parent | a748c08241e43fc68c7c34767d819aef5183936e (diff) | |
Merge changes I4f72448f,I74b7233c into nyc-dev
* changes:
Fix ripple positioning within scrolled node
Clip projected ripples to outlines
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/HwAccelerationTest/res/layout/projection_clipping.xml | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/tests/HwAccelerationTest/res/layout/projection_clipping.xml b/tests/HwAccelerationTest/res/layout/projection_clipping.xml index 1f2b93946f48..1ea9f9cd49f6 100644 --- a/tests/HwAccelerationTest/res/layout/projection_clipping.xml +++ b/tests/HwAccelerationTest/res/layout/projection_clipping.xml @@ -3,24 +3,32 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <FrameLayout + <ScrollView + android:orientation="vertical" android:translationX="50dp" android:translationY="50dp" android:elevation="30dp" android:layout_width="200dp" android:layout_height="200dp" android:background="@drawable/round_rect_background"> - <View - android:id="@+id/clickable1" - android:layout_width="100dp" - android:layout_height="100dp" - android:background="?android:attr/selectableItemBackgroundBorderless"/> - <View - android:id="@+id/clickable2" - android:translationX="50dp" - android:translationY="10dp" - android:layout_width="150dp" - android:layout_height="100dp" - android:background="?android:attr/selectableItemBackgroundBorderless"/> - </FrameLayout> + <FrameLayout + android:layout_width="200dp" + android:layout_height="wrap_content"> + <View + android:layout_width="200dp" + android:layout_height="2000dp"/> + <View + android:id="@+id/clickable1" + android:layout_width="100dp" + android:layout_height="100dp" + android:background="?android:attr/selectableItemBackgroundBorderless"/> + <View + android:id="@+id/clickable2" + android:translationX="50dp" + android:translationY="10dp" + android:layout_width="150dp" + android:layout_height="100dp" + android:background="?android:attr/selectableItemBackgroundBorderless"/> + </FrameLayout> + </ScrollView> </LinearLayout> |