Add feature flags to enable/disable (Autofill Assistant) Direct Actions.
Background: http://go/chrome-direct-actions
Change-Id: I2796acc0b165841d5253714f0f01044eeca4364d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1669360
Commit-Queue: Jordan Demeulenaere <[email protected]>
Auto-Submit: Jordan Demeulenaere <[email protected]>
Reviewed-by: Stephane Zermatten <[email protected]>
Reviewed-by: Ted Choc <[email protected]>
Cr-Commit-Position: refs/heads/master@{#673698}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
index 1a07c4a..eacc712 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeFeatureList.java
@@ -170,6 +170,7 @@
public static final String ANDROID_SITE_SETTINGS_UI_REFRESH = "AndroidSiteSettingsUIRefresh";
public static final String APP_NOTIFICATION_STATUS_MESSAGING = "AppNotificationStatusMessaging";
public static final String AUTOFILL_ASSISTANT = "AutofillAssistant";
+ public static final String AUTOFILL_ASSISTANT_DIRECT_ACTIONS = "AutofillAssistantDirectActions";
public static final String AUTOFILL_MANUAL_FALLBACK_ANDROID = "AutofillManualFallbackAndroid";
public static final String AUTOFILL_REFRESH_STYLE_ANDROID = "AutofillRefreshStyleAndroid";
public static final String AUTOFILL_KEYBOARD_ACCESSORY = "AutofillKeyboardAccessory";
@@ -218,6 +219,7 @@
"ContextualSearchUnityIntegration";
public static final String CUSTOM_CONTEXT_MENU = "CustomContextMenu";
public static final String DELEGATE_OVERSCROLL_SWIPES = "DelegateOverscrollSwipes";
+ public static final String DIRECT_ACTIONS = "DirectActions";
public static final String DOWNLOAD_LOCATION_SHOW_IMAGE_IN_GALLERY =
"DownloadLocationShowImageInGallery";
public static final String DOWNLOAD_HOME_SHOW_STORAGE_INFO = "DownloadHomeShowStorageInfo";
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index ba14c0e..f23f1777 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1244,6 +1244,9 @@
flag_descriptions::kContextualSearchUnityIntegrationDescription,
kOsAndroid,
FEATURE_VALUE_TYPE(chrome::android::kContextualSearchUnityIntegration)},
+ {"direct-actions", flag_descriptions::kDirectActionsName,
+ flag_descriptions::kDirectActionsDescription, kOsAndroid,
+ FEATURE_VALUE_TYPE(chrome::android::kDirectActions)},
{"explore-sites", flag_descriptions::kExploreSitesName,
flag_descriptions::kExploreSitesDescription, kOsAndroid,
FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kExploreSites,
@@ -3668,6 +3671,12 @@
flag_descriptions::kAutofillAssistantChromeEntryDescription, kOsAndroid,
FEATURE_VALUE_TYPE(
autofill_assistant::features::kAutofillAssistantChromeEntry)},
+
+ {"autofill-assistant-direct-actions",
+ flag_descriptions::kAutofillAssistantDirectActionsName,
+ flag_descriptions::kAutofillAssistantDirectActionsDescription, kOsAndroid,
+ FEATURE_VALUE_TYPE(
+ autofill_assistant::features::kAutofillAssistantDirectActions)},
#endif // defined(OS_ANDROID)
{"disable-best-effort-tasks",
diff --git a/chrome/browser/android/chrome_feature_list.cc b/chrome/browser/android/chrome_feature_list.cc
index ce26e15..da09193 100644
--- a/chrome/browser/android/chrome_feature_list.cc
+++ b/chrome/browser/android/chrome_feature_list.cc
@@ -59,6 +59,7 @@
&autofill::features::kAutofillRefreshStyleAndroid,
&autofill::features::kAutofillEnableCompanyName,
&autofill_assistant::features::kAutofillAssistant,
+ &autofill_assistant::features::kAutofillAssistantDirectActions,
&download::features::kDownloadAutoResumptionNative,
&download::features::kUseDownloadOfflineContentProvider,
&features::kAllowStartingServiceManagerOnly,
@@ -125,6 +126,7 @@
&kContextualSearchUnityIntegration,
&kCustomContextMenu,
&kDelegateOverscrollSwipes,
+ &kDirectActions,
&kDownloadLocationShowImageInGallery,
&kDownloadProgressInfoBar,
&kDownloadHomeV2,
@@ -375,6 +377,9 @@
const base::Feature kDelegateOverscrollSwipes{
"DelegateOverscrollSwipes", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kDirectActions{"DirectActions",
+ base::FEATURE_DISABLED_BY_DEFAULT};
+
const base::Feature kDrawVerticallyEdgeToEdge{
"DrawVerticallyEdgeToEdge", base::FEATURE_DISABLED_BY_DEFAULT};
diff --git a/chrome/browser/android/chrome_feature_list.h b/chrome/browser/android/chrome_feature_list.h
index 19448cb..a395f60 100644
--- a/chrome/browser/android/chrome_feature_list.h
+++ b/chrome/browser/android/chrome_feature_list.h
@@ -59,6 +59,7 @@
extern const base::Feature kContextualSearchUnityIntegration;
extern const base::Feature kCustomContextMenu;
extern const base::Feature kDelegateOverscrollSwipes;
+extern const base::Feature kDirectActions;
extern const base::Feature kDontPrefetchLibraries;
extern const base::Feature kDownloadAutoResumptionThrottling;
extern const base::Feature kDownloadLocationShowImageInGallery;
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json
index 1d96f02..09dbf93 100644
--- a/chrome/browser/flag-metadata.json
+++ b/chrome/browser/flag-metadata.json
@@ -222,6 +222,11 @@
"expiry_milestone": 79
},
{
+ "name": "autofill-assistant-direct-actions",
+ "owners": [ "//components/autofill_assistant/OWNERS" ],
+ "expiry_milestone": 81
+ },
+ {
"name": "autofill-cache-query-responses",
"owners": [ "rogerm" ],
"expiry_milestone": 72
@@ -564,6 +569,11 @@
"expiry_milestone": 83
},
{
+ "name": "direct-actions",
+ "owners": [ "szermatt", "tedchoc", "twellington" ],
+ "expiry_milestone": 81
+ },
+ {
"name": "direct-manipulation-stylus",
"owners": [ "lanwei", "input-dev" ],
"expiry_milestone": 76
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
index d852ad59..e9819b3 100644
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -132,6 +132,11 @@
extern const char kAutofillAssistantChromeEntryDescription[] =
"Initiate autofill assistant from within Chrome.";
+extern const char kAutofillAssistantDirectActionsName[] =
+ "Autofill Assistant direct actions";
+extern const char kAutofillAssistantDirectActionsDescription[] =
+ "When enabled, expose direct actions from the Autofill Assistant.";
+
const char kAutofillCacheQueryResponsesName[] =
"Cache Autofill Query Responses";
const char kAutofillCacheQueryResponsesDescription[] =
@@ -2239,6 +2244,10 @@
const char kContextualSearchUnityIntegrationDescription[] =
"Enables integration of Tap to Search with Unified Consent.";
+const char kDirectActionsName[] = "Direct actions";
+const char kDirectActionsDescription[] =
+ "Enables direct actions (Android Q and more).";
+
const char kDownloadProgressInfoBarName[] = "Enable download progress infobar";
const char kDownloadProgressInfoBarDescription[] =
"Enables an infobar notifying users about status of current downloads.";
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
index 0dc635a4..f1745ae 100644
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1259,6 +1259,9 @@
extern const char kAutofillAccessoryViewName[];
extern const char kAutofillAccessoryViewDescription[];
+extern const char kAutofillAssistantDirectActionsName[];
+extern const char kAutofillAssistantDirectActionsDescription[];
+
extern const char kAutofillUseMobileLabelDisambiguationName[];
extern const char kAutofillUseMobileLabelDisambiguationDescription[];
@@ -1322,6 +1325,9 @@
extern const char kContextualSearchUnityIntegrationName[];
extern const char kContextualSearchUnityIntegrationDescription[];
+extern const char kDirectActionsName[];
+extern const char kDirectActionsDescription[];
+
extern const char kDontPrefetchLibrariesName[];
extern const char kDontPrefetchLibrariesDescription[];
diff --git a/components/autofill_assistant/browser/features.cc b/components/autofill_assistant/browser/features.cc
index 845b393..9e1396c 100644
--- a/components/autofill_assistant/browser/features.cc
+++ b/components/autofill_assistant/browser/features.cc
@@ -16,5 +16,8 @@
const base::Feature kAutofillAssistantChromeEntry{
"AutofillAssistantChromeEntry", base::FEATURE_DISABLED_BY_DEFAULT};
+const base::Feature kAutofillAssistantDirectActions{
+ "AutofillAssistantDirectActions", base::FEATURE_DISABLED_BY_DEFAULT};
+
} // namespace features
} // namespace autofill_assistant
\ No newline at end of file
diff --git a/components/autofill_assistant/browser/features.h b/components/autofill_assistant/browser/features.h
index eedd49e4..689c466b 100644
--- a/components/autofill_assistant/browser/features.h
+++ b/components/autofill_assistant/browser/features.h
@@ -14,6 +14,7 @@
// All features in alphabetical order.
extern const base::Feature kAutofillAssistant;
extern const base::Feature kAutofillAssistantChromeEntry;
+extern const base::Feature kAutofillAssistantDirectActions;
} // namespace features
} // namespace autofill_assistant
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml
index 7ceaba9..f0dc904 100644
--- a/tools/metrics/histograms/enums.xml
+++ b/tools/metrics/histograms/enums.xml
@@ -33476,6 +33476,7 @@
<int value="-2082462043" label="ViewPasswords:disabled"/>
<int value="-2082042818"
label="AutofillCreditCardLastUsedDateDisplay:enabled"/>
+ <int value="-2080657940" label="DirectActions:disabled"/>
<int value="-2080504230" label="TabHoverCards:disabled"/>
<int value="-2077268643" label="disable-device-enumeration"/>
<int value="-2075870708" label="MediaRemotingEncrypted:disabled"/>
@@ -34035,6 +34036,7 @@
<int value="-1343259222" label="RegionalLocalesAsDisplayUI:disabled"/>
<int value="-1342961844" label="InlineUpdateFlow:disabled"/>
<int value="-1342039126" label="AshNewSystemMenu:enabled"/>
+ <int value="-1341685799" label="AutofillAssistantDirectActions:enabled"/>
<int value="-1341092934" label="enable-accelerated-overflow-scroll"/>
<int value="-1340055960" label="enable-streamlined-hosted-apps"/>
<int value="-1338306372" label="BrowserTouchBar:enabled"/>
@@ -34678,6 +34680,7 @@
<int value="-408769228" label="ArcGraphicBuffersVisualizationTool:disabled"/>
<int value="-406850932" label="EnableEmojiContextMenu:enabled"/>
<int value="-405380243" label="enable-encryption-migration"/>
+ <int value="-403701720" label="DirectActions:enabled"/>
<int value="-402038055"
label="OmniboxUIExperimentBlueTitlesAndGrayUrlsOnPageSuggestions:enabled"/>
<int value="-401170566"
@@ -34786,6 +34789,7 @@
<int value="-263150202" label="BundledConnectionHelp:disabled"/>
<int value="-262122630" label="ArcEnableDocumentsProviderInFilesApp:enabled"/>
<int value="-260355779" label="UnfilteredBluetoothDevices:enabled"/>
+ <int value="-258081634" label="AutofillAssistantDirectActions:disabled"/>
<int value="-254887599" label="google-profile-info"/>
<int value="-250822813" label="PwaImprovedSplashScreen:enabled"/>
<int value="-250721831" label="AndroidAutofillAccessibility:disabled"/>