PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inflate dismissal background instead of drawing while swiping" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-09 17:11:11 +00:00
committed by Android (Google) Code Review
parent 3a9707b81a dc2b2c7929
commit a31acac404
8 changed files with 147 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRendererTest.java
View File

@@ -149,7 +149,7 @@ public class SliceContextualCardRendererTest {
btnKeep.performClick();
assertThat(viewFlipper.getCurrentView()).isInstanceOf(SliceView.class);
assertThat(viewFlipper.getCurrentView().getId()).isEqualTo(R.id.slice_view_wrapper);
}
@Test
@@ -204,7 +204,7 @@ public class SliceContextualCardRendererTest {
mRenderer.onStop();
assertThat(viewFlipper.getCurrentView()).isInstanceOf(SliceView.class);
assertThat(viewFlipper.getCurrentView().getId()).isEqualTo(R.id.slice_view_wrapper);
}
private RecyclerView.ViewHolder getSliceViewHolder() {

4
tests/robotests/src/com/android/settings/homepage/contextualcards/slices/SwipeDismissalDelegateTest.java
View File

@@ -99,9 +99,9 @@ public class SwipeDismissalDelegateTest {
final RecyclerView.ViewHolder holder = getSliceViewHolder();
final ViewFlipper viewFlipper = holder.itemView.findViewById(R.id.view_flipper);
viewFlipper.setDisplayedChild(0);
final View sliceView = holder.itemView.findViewById(R.id.slice_view);
final View sliceViewWrapper = holder.itemView.findViewById(R.id.slice_view_wrapper);
assertThat(viewFlipper.getCurrentView()).isEqualTo(sliceView);
assertThat(viewFlipper.getCurrentView()).isEqualTo(sliceViewWrapper);
assertThat(mDismissalDelegate.getMovementFlags(mRecyclerView, getSliceViewHolder()))
.isNotEqualTo(0);
}