From 8397111c0234fa1ea639c85677065482a4c34727 Mon Sep 17 00:00:00 2001 From: Andrey Epin Date: Mon, 6 Feb 2023 21:31:44 -0800 Subject: Run Chooser integration tests for the new features Add a new test parameter, feature flag set, and run Chooser tests for two set values: all flags are off and all flags are on. This ensures that our integration tests cover the new features. A new test rule is added to ignore tests that were designed for a specific flag values when running in a set that does not have those values set. Bug: 258838272 Test: the modified test itself Change-Id: If646ef123a383e801fda55d601e10b186c6c5c1f (cherry picked from commit 880417ed82485d63c87737d38a270a3367d27594) Merged-In: If646ef123a383e801fda55d601e10b186c6c5c1f --- java/src/com/android/intentresolver/flags/Flags.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'java/src') diff --git a/java/src/com/android/intentresolver/flags/Flags.kt b/java/src/com/android/intentresolver/flags/Flags.kt index 59b5ea74..f4dbeddb 100644 --- a/java/src/com/android/intentresolver/flags/Flags.kt +++ b/java/src/com/android/intentresolver/flags/Flags.kt @@ -21,24 +21,33 @@ import com.android.systemui.flags.UnreleasedFlag // Flag id, name and namespace should be kept in sync with [com.android.systemui.flags.Flags] to // make the flags available in the flag flipper app (see go/sysui-flags). object Flags { + const val SHARESHEET_CUSTOM_ACTIONS_NAME = "sharesheet_custom_actions" + const val SHARESHEET_RESELECTION_ACTION_NAME = "sharesheet_reselection_action" + const val SHARESHEET_IMAGE_AND_TEXT_PREVIEW_NAME = "sharesheet_image_text_preview" + const val SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME = "sharesheet_scrollable_image_preview" + // TODO(b/266983432) Tracking Bug @JvmField - val SHARESHEET_CUSTOM_ACTIONS = unreleasedFlag(1501, "sharesheet_custom_actions", teamfood = true) + val SHARESHEET_CUSTOM_ACTIONS = unreleasedFlag( + 1501, SHARESHEET_CUSTOM_ACTIONS_NAME, teamfood = true + ) // TODO(b/266982749) Tracking Bug @JvmField - val SHARESHEET_RESELECTION_ACTION = unreleasedFlag(1502, "sharesheet_reselection_action", teamfood = true) + val SHARESHEET_RESELECTION_ACTION = unreleasedFlag( + 1502, SHARESHEET_RESELECTION_ACTION_NAME, teamfood = true + ) // TODO(b/266983474) Tracking Bug @JvmField val SHARESHEET_IMAGE_AND_TEXT_PREVIEW = unreleasedFlag( - id = 1503, name = "sharesheet_image_text_preview", teamfood = true + id = 1503, name = SHARESHEET_IMAGE_AND_TEXT_PREVIEW_NAME, teamfood = true ) // TODO(b/267355521) Tracking Bug @JvmField val SHARESHEET_SCROLLABLE_IMAGE_PREVIEW = unreleasedFlag( - 1504, "sharesheet_scrollable_image_preview", teamfood = true + 1504, SHARESHEET_SCROLLABLE_IMAGE_PREVIEW_NAME, teamfood = true ) private fun unreleasedFlag(id: Int, name: String, teamfood: Boolean = false) = -- cgit v1.2.3-59-g8ed1b