Merge "Replace USE_DELEGATE_CHOOSER with USE_UNBUNDLED_SHARESHEET" into tm-dev

core/java/com/android/internal/config/sysui/SystemUiDeviceConfigFlags.java

@@ -514,9 +514,10 @@ public final class SystemUiDeviceConfigFlags {
             "is_nearby_share_first_target_in_ranked_app";
 
     /**
-     * (boolean) Whether to enable the new unbundled "delegate chooser" implementation.
+     * (boolean) Whether to enable the new unbundled sharesheet
+     * (com.android.intentresolver.ChooserActivity).
      */
-    public static final String USE_DELEGATE_CHOOSER = "use_delegate_chooser";
+    public static final String USE_UNBUNDLED_SHARESHEET = "use_unbundled_sharesheet";
 
     /**
      * (string) Name of the default QR code scanner activity. On the eligible devices this activity

services/core/java/com/android/server/pm/IntentResolverInterceptor.java

@@ -81,7 +81,7 @@ public final class IntentResolverInterceptor {
     private void updateUseDelegateChooser() {
         mUseDelegateChooser = DeviceConfig.getBoolean(
                 DeviceConfig.NAMESPACE_SYSTEMUI,
-                SystemUiDeviceConfigFlags.USE_DELEGATE_CHOOSER,
+                SystemUiDeviceConfigFlags.USE_UNBUNDLED_SHARESHEET,
                 false);
     }