diff options
Diffstat (limited to 'tests')
4 files changed, 21 insertions, 7 deletions
diff --git a/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java index 4ea0681d..c0121f2e 100644 --- a/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java +++ b/tests/activity/src/com/android/intentresolver/ChooserWrapperActivity.java @@ -93,7 +93,8 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW maxTargetsPerRow, userHandle, targetDataLoader, - null); + null, + mFeatureFlags); } @Override diff --git a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java index 04efc4e2..700be615 100644 --- a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java +++ b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java @@ -106,7 +106,8 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW maxTargetsPerRow, userHandle, targetDataLoader, - null); + null, + mFeatureFlags); } @Override diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt index 98c5e008..ca91c243 100644 --- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt +++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterDataTest.kt @@ -46,6 +46,8 @@ class ChooserListAdapterDataTest { private val immediateExecutor = TestExecutor(immediate = true) private val referrerFillInIntent = Intent().putExtra(Intent.EXTRA_REFERRER, "org.referrer.package") + private val featureFlags = + FakeFeatureFlagsImpl().apply { setFlag(Flags.FLAG_BESPOKE_LABEL_VIEW, false) } @Test fun test_twoTargetsWithNonOverlappingInitialIntent_threeTargetsInResolverAdapter() { @@ -97,6 +99,7 @@ class ChooserListAdapterDataTest { null, backgroundExecutor, immediateExecutor, + featureFlags, ) val doPostProcessing = true @@ -160,6 +163,7 @@ class ChooserListAdapterDataTest { null, backgroundExecutor, immediateExecutor, + featureFlags, ) val doPostProcessing = true diff --git a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt index cb043943..3c23ff26 100644 --- a/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt +++ b/tests/unit/src/com/android/intentresolver/ChooserListAdapterTest.kt @@ -33,6 +33,7 @@ import com.android.intentresolver.chooser.SelectableTargetInfo import com.android.intentresolver.chooser.TargetInfo import com.android.intentresolver.icons.TargetDataLoader import com.android.intentresolver.logging.EventLogImpl +import com.android.intentresolver.widget.BadgeTextView import com.android.internal.R import com.google.common.truth.Truth.assertThat import org.junit.Before @@ -57,6 +58,7 @@ class ChooserListAdapterTest { private val mEventLog = mock<EventLogImpl>() private val mTargetDataLoader = mock<TargetDataLoader>() private val mPackageChangeCallback = mock<ChooserListAdapter.PackageChangeCallback>() + private val featureFlags = FeatureFlagsImpl() private val testSubject by lazy { ChooserListAdapter( @@ -75,7 +77,8 @@ class ChooserListAdapterTest { 0, null, mTargetDataLoader, - mPackageChangeCallback + mPackageChangeCallback, + featureFlags, ) } @@ -216,10 +219,15 @@ class ChooserListAdapterTest { private fun createView(): View { val view = FrameLayout(context) - TextView(context).apply { - id = R.id.text1 - view.addView(this) - } + if (featureFlags.bespokeLabelView()) { + BadgeTextView(context) + } else { + TextView(context) + } + .apply { + id = R.id.text1 + view.addView(this) + } TextView(context).apply { id = R.id.text2 view.addView(this) |