Merge "[Partial screen sharing] App selector initial version" into tm-qpr-dev (0b670f20) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -265,6 +265,7 @@ public class ResolverListAdapter extends BaseAdapter {
		return mResolverListController.getResolversForIntent(
		/* shouldGetResolvedFilter= */ true,
		mResolverListCommunicator.shouldGetActivityMetadata(),
		mResolverListCommunicator.shouldGetOnlyDefaultActivities(),
		mIntents);
		}
		}
		@@ -727,6 +728,7 @@ public class ResolverListAdapter extends BaseAdapter {
		protected List<ResolvedComponentInfo> getResolversForUser(UserHandle userHandle) {
		return mResolverListController.getResolversForIntentAsUser(true,
		mResolverListCommunicator.shouldGetActivityMetadata(),
		mResolverListCommunicator.shouldGetOnlyDefaultActivities(),
		mIntents, userHandle);
		}

		@@ -820,6 +822,12 @@ public class ResolverListAdapter extends BaseAdapter {

		boolean shouldGetActivityMetadata();

		/**
		* @return true to filter only apps that can handle
		* {@link android.content.Intent#CATEGORY_DEFAULT} intents
		*/
		default boolean shouldGetOnlyDefaultActivities() { return true; };

		Intent getTargetIntent();

		void onHandlePackagesChanged(ResolverListAdapter listAdapter);

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -110,17 +110,19 @@ public class ResolverListController {
		public List<ResolverActivity.ResolvedComponentInfo> getResolversForIntent(
		boolean shouldGetResolvedFilter,
		boolean shouldGetActivityMetadata,
		boolean shouldGetOnlyDefaultActivities,
		List<Intent> intents) {
		return getResolversForIntentAsUser(shouldGetResolvedFilter, shouldGetActivityMetadata,
		intents, mUserHandle);
		shouldGetOnlyDefaultActivities, intents, mUserHandle);
		}

		public List<ResolverActivity.ResolvedComponentInfo> getResolversForIntentAsUser(
		boolean shouldGetResolvedFilter,
		boolean shouldGetActivityMetadata,
		boolean shouldGetOnlyDefaultActivities,
		List<Intent> intents,
		UserHandle userHandle) {
		int baseFlags = PackageManager.MATCH_DEFAULT_ONLY
		int baseFlags = (shouldGetOnlyDefaultActivities ? PackageManager.MATCH_DEFAULT_ONLY : 0)
		\| PackageManager.MATCH_DIRECT_BOOT_AWARE
		\| PackageManager.MATCH_DIRECT_BOOT_UNAWARE
		\| (shouldGetResolvedFilter ? PackageManager.GET_RESOLVED_FILTER : 0)

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

+47 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -287,6 +288,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -307,6 +309,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -327,6 +330,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -350,6 +354,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -376,6 +381,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -401,6 +407,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -422,6 +429,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -476,6 +484,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -516,6 +525,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -550,6 +560,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -585,6 +596,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -647,6 +659,7 @@ public class ChooserActivityTest {
		ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -686,6 +699,7 @@ public class ChooserActivityTest {
		ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -718,6 +732,7 @@ public class ChooserActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -745,6 +760,7 @@ public class ChooserActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -774,6 +790,7 @@ public class ChooserActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -844,6 +861,7 @@ public class ChooserActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -920,6 +938,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -956,6 +975,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -995,6 +1015,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1089,6 +1110,7 @@ public class ChooserActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		@@ -1122,6 +1144,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1155,6 +1178,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1187,6 +1211,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1216,6 +1241,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1248,6 +1274,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1282,6 +1309,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1321,6 +1349,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1363,6 +1392,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1407,6 +1437,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1483,6 +1514,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1564,6 +1596,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1636,6 +1669,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -1743,6 +1777,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2058,6 +2093,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2140,6 +2176,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2227,6 +2264,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2296,6 +2334,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2444,6 +2483,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2473,6 +2513,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2526,6 +2567,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -2662,6 +2704,7 @@ public class ChooserActivityTest {
		List<ResolvedComponentInfo> personalResolvedComponentInfos =
		createResolvedComponentsForTest(4);
		when(ChooserActivityOverrideData.getInstance().resolverListController.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -3055,6 +3098,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -3064,6 +3108,7 @@ public class ChooserActivityTest {
		.getInstance()
		.workResolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		@@ -3073,6 +3118,7 @@ public class ChooserActivityTest {
		.getInstance()
		.workResolverListController
		.getResolversForIntentAsUser(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class),
		@@ -3129,6 +3175,7 @@ public class ChooserActivityTest {
		.getInstance()
		.resolverListController
		.getResolversForIntent(
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ public class ResolverActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);

		@@ -126,6 +127,7 @@ public class ResolverActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		waitForIdle();
		@@ -170,6 +172,7 @@ public class ResolverActivityTest {
		List<ResolvedComponentInfo> resolvedComponentInfos = createResolvedComponentsForTest(2);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		waitForIdle();
		@@ -202,6 +205,7 @@ public class ResolverActivityTest {
		ResolveInfo toChoose = resolvedComponentInfos.get(0).getResolveInfoAt(0);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		when(sOverrides.resolverListController.getLastChosen())
		@@ -272,6 +276,7 @@ public class ResolverActivityTest {
		ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);

		@@ -316,6 +321,7 @@ public class ResolverActivityTest {
		ResolveInfo toChoose = resolvedComponentInfos.get(1).getResolveInfoAt(0);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		when(sOverrides.resolverListController.getLastChosen())
		@@ -806,6 +812,7 @@ public class ResolverActivityTest {
		List<ResolvedComponentInfo> personalResolvedComponentInfos =
		createResolvedComponentsForTestWithOtherProfile(2, /* userId */ 10);
		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		.thenReturn(new ArrayList<>(personalResolvedComponentInfos));
		@@ -830,6 +837,7 @@ public class ResolverActivityTest {
		List<ResolvedComponentInfo> personalResolvedComponentInfos =
		createResolvedComponentsForTest(1);
		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		.thenReturn(new ArrayList<>(personalResolvedComponentInfos));
		@@ -887,6 +895,7 @@ public class ResolverActivityTest {
		createResolvedComponentsForTest(2);

		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(resolvedComponentInfos);
		when(sOverrides.resolverListController.getLastChosen())
		@@ -964,13 +973,16 @@ public class ResolverActivityTest {
		List<ResolvedComponentInfo> personalResolvedComponentInfos,
		List<ResolvedComponentInfo> workResolvedComponentInfos) {
		when(sOverrides.resolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class)))
		.thenReturn(new ArrayList<>(personalResolvedComponentInfos));
		when(sOverrides.workResolverListController.getResolversForIntent(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class))).thenReturn(workResolvedComponentInfos);
		when(sOverrides.workResolverListController.getResolversForIntentAsUser(Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.anyBoolean(),
		Mockito.isA(List.class),
		eq(UserHandle.SYSTEM)))

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

+120 −4

File changed.

Preview size limit exceeded, changes collapsed.