Merge "Treat all inactive profiles equally" into main

3 files changed, 4 insertions, 16 deletions

diff --git a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
index 113d0987..700be615 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/v2/ChooserWrapperActivity.java
@@ -40,7 +40,6 @@ import com.android.intentresolver.TestContentPreviewViewModel;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
-import com.android.intentresolver.grid.ChooserGridAdapter;
 import com.android.intentresolver.icons.TargetDataLoader;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -118,17 +117,12 @@ public class ChooserWrapperActivity extends ChooserActivity implements IChooserW
 
     @Override
     public ChooserListAdapter getPersonalListAdapter() {
-        return ((ChooserGridAdapter) mMultiProfilePagerAdapter.getAdapterForIndex(0))
-                .getListAdapter();
+        return mChooserMultiProfilePagerAdapter.getPersonalListAdapter();
     }
 
     @Override
     public ChooserListAdapter getWorkListAdapter() {
-        if (mMultiProfilePagerAdapter.getInactiveListAdapter() == null) {
-            return null;
-        }
-        return ((ChooserGridAdapter) mMultiProfilePagerAdapter.getAdapterForIndex(1))
-                .getListAdapter();
+        return mChooserMultiProfilePagerAdapter.getWorkListAdapter();
     }
 
     @Override
diff --git a/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java b/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
index 7ae58254..a09ee894 100644
--- a/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
+++ b/tests/activity/src/com/android/intentresolver/v2/ResolverWrapperActivity.java
@@ -118,14 +118,11 @@ public class ResolverWrapperActivity extends ResolverActivity {
     }
 
     ResolverListAdapter getPersonalListAdapter() {
-        return ((ResolverListAdapter) mMultiProfilePagerAdapter.getAdapterForIndex(0));
+        return mMultiProfilePagerAdapter.getPersonalListAdapter();
     }
 
     ResolverListAdapter getWorkListAdapter() {
-        if (mMultiProfilePagerAdapter.getInactiveListAdapter() == null) {
-            return null;
-        }
-        return ((ResolverListAdapter) mMultiProfilePagerAdapter.getAdapterForIndex(1));
+        return mMultiProfilePagerAdapter.getWorkListAdapter();
     }
 
     @Override
diff --git a/tests/unit/src/com/android/intentresolver/v2/MultiProfilePagerAdapterTest.kt b/tests/unit/src/com/android/intentresolver/v2/MultiProfilePagerAdapterTest.kt
index f5dc0935..892fbb4e 100644
--- a/tests/unit/src/com/android/intentresolver/v2/MultiProfilePagerAdapterTest.kt
+++ b/tests/unit/src/com/android/intentresolver/v2/MultiProfilePagerAdapterTest.kt
@@ -69,7 +69,6 @@ class MultiProfilePagerAdapterTest {
         assertThat(pagerAdapter.currentUserHandle).isEqualTo(PERSONAL_USER_HANDLE)
         assertThat(pagerAdapter.getAdapterForIndex(0)).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.activeListAdapter).isSameInstanceAs(personalListAdapter)
-        assertThat(pagerAdapter.inactiveListAdapter).isNull()
         assertThat(pagerAdapter.personalListAdapter).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.workListAdapter).isNull()
         assertThat(pagerAdapter.itemCount).isEqualTo(1)
@@ -104,7 +103,6 @@ class MultiProfilePagerAdapterTest {
         assertThat(pagerAdapter.getAdapterForIndex(0)).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.getAdapterForIndex(1)).isSameInstanceAs(workListAdapter)
         assertThat(pagerAdapter.activeListAdapter).isSameInstanceAs(personalListAdapter)
-        assertThat(pagerAdapter.inactiveListAdapter).isSameInstanceAs(workListAdapter)
         assertThat(pagerAdapter.personalListAdapter).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.workListAdapter).isSameInstanceAs(workListAdapter)
         assertThat(pagerAdapter.itemCount).isEqualTo(2)
@@ -143,7 +141,6 @@ class MultiProfilePagerAdapterTest {
         assertThat(pagerAdapter.getAdapterForIndex(0)).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.getAdapterForIndex(1)).isSameInstanceAs(workListAdapter)
         assertThat(pagerAdapter.activeListAdapter).isSameInstanceAs(workListAdapter)
-        assertThat(pagerAdapter.inactiveListAdapter).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.personalListAdapter).isSameInstanceAs(personalListAdapter)
         assertThat(pagerAdapter.workListAdapter).isSameInstanceAs(workListAdapter)
         assertThat(pagerAdapter.itemCount).isEqualTo(2)