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

Merge "Remove dismissal behavior from deferred setup card"

Browse Source
This commit is contained in:
Yanting Yang
2019-03-06 08:45:32 +00:00
committed by Android (Google) Code Review
parent 131eeac4aa 52367e8c65
commit be15baa155
3 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,11 +16,13 @@
package com.android.settings.homepage.contextualcards.slices;
import static com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer.VIEW_TYPE_DEFERRED_SETUP;
import static com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer.VIEW_TYPE_FULL_WIDTH;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.app.Activity;
@@ -128,6 +130,15 @@ public class SliceContextualCardRendererTest {
assertThat(viewFlipper.getCurrentView()).isEqualTo(dismissalView);
}
@Test
public void longClick_deferredSetupCard_shouldNotBeClickable() {
final RecyclerView.ViewHolder viewHolder = getDeferredSetupViewHolder();
final View contentView = viewHolder.itemView.findViewById(R.id.content);
mRenderer.bindView(viewHolder, buildContextualCard(TEST_SLICE_URI));
assertThat(contentView.isLongClickable()).isFalse();
}
@Test
public void longClick_shouldAddViewHolderToSet() {
final RecyclerView.ViewHolder viewHolder = getSliceViewHolder();
@@ -221,6 +232,18 @@ public class SliceContextualCardRendererTest {
return mRenderer.createViewHolder(view, VIEW_TYPE_FULL_WIDTH);
}
private RecyclerView.ViewHolder getDeferredSetupViewHolder() {
final RecyclerView recyclerView = new RecyclerView(mActivity);
recyclerView.setLayoutManager(new LinearLayoutManager(mActivity));
final View view = LayoutInflater.from(mActivity).inflate(VIEW_TYPE_DEFERRED_SETUP,
recyclerView, false);
final RecyclerView.ViewHolder viewHolder = spy(
mRenderer.createViewHolder(view, VIEW_TYPE_DEFERRED_SETUP));
doReturn(VIEW_TYPE_DEFERRED_SETUP).when(viewHolder).getItemViewType();
return viewHolder;
}
private ContextualCard buildContextualCard(Uri sliceUri) {
return new ContextualCard.Builder()
.setName("test_name")