Merge "Enable Sharesheet direct share target append prototype for droidfood." into rvc-dev (66726b1e) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -235,7 +235,7 @@ public class ChooserActivity extends ResolverActivity implements
		private boolean mAppendDirectShareEnabled = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.APPEND_DIRECT_SHARE_ENABLED,
		false);
		true);

		private Bundle mReplacementExtras;
		private IntentSender mChosenComponentSender;

core/java/com/android/internal/app/ChooserListAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,7 @@ public class ChooserListAdapter extends ResolverListAdapter {
		private boolean mAppendDirectShareEnabled = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.APPEND_DIRECT_SHARE_ENABLED,
		false);
		true);

		private boolean mEnableStackedApps = true;

core/tests/coretests/src/com/android/internal/app/ChooserActivityTest.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ import android.graphics.drawable.Icon;
		import android.metrics.LogMaker;
		import android.net.Uri;
		import android.os.UserHandle;
		import android.provider.DeviceConfig;
		import android.service.chooser.ChooserTarget;

		import androidx.test.platform.app.InstrumentationRegistry;
		@@ -75,6 +76,7 @@ import androidx.test.rule.ActivityTestRule;
		import com.android.internal.R;
		import com.android.internal.app.ResolverActivity.ResolvedComponentInfo;
		import com.android.internal.app.chooser.DisplayResolveInfo;
		import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
		import com.android.internal.util.FrameworkStatsLog;
		@@ -141,6 +143,10 @@ public class ChooserActivityTest {
		public void cleanOverrideData() {
		sOverrides.reset();
		sOverrides.createPackageManager = mPackageManagerOverride;
		DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
		SystemUiDeviceConfigFlags.APPEND_DIRECT_SHARE_ENABLED,
		Boolean.toString(false),
		true /* makeDefault*/);
		}

		@Test
		@@ -989,7 +995,7 @@ public class ChooserActivityTest {
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		null)
		List.of())
		);

		// Thread.sleep shouldn't be a thing in an integration test but it's
		@@ -1061,7 +1067,7 @@ public class ChooserActivityTest {
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		null)
		List.of())
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured
		@@ -1149,7 +1155,7 @@ public class ChooserActivityTest {
		serviceTargets,
		TARGET_TYPE_CHOOSER_TARGET,
		directShareToShortcutInfos,
		null)
		List.of())
		);
		// Thread.sleep shouldn't be a thing in an integration test but it's
		// necessary here because of the way the code is structured