Merge "Merge the `MultiProfilePagerAdapter` base classes" into main

4 files changed, 20 insertions, 27 deletions

diff --git a/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java b/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java
index b1424849..3bf144dd 100644
--- a/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java
+++ b/java/tests/src/com/android/intentresolver/ChooserActivityOverrideData.java
@@ -26,7 +26,7 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.os.UserHandle;
 
-import com.android.intentresolver.AbstractMultiProfilePagerAdapter.CrossProfileIntentsChecker;
+import com.android.intentresolver.MultiProfilePagerAdapter.CrossProfileIntentsChecker;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.contentpreview.ImageLoader;
 import com.android.intentresolver.shortcuts.ShortcutLoader;
diff --git a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
index 48f8be5d..64c4a50a 100644
--- a/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ChooserWrapperActivity.java
@@ -34,7 +34,7 @@ import android.os.UserHandle;
 
 import androidx.lifecycle.ViewModelProvider;
 
-import com.android.intentresolver.AbstractMultiProfilePagerAdapter.CrossProfileIntentsChecker;
+import com.android.intentresolver.MultiProfilePagerAdapter.CrossProfileIntentsChecker;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
 import com.android.intentresolver.grid.ChooserGridAdapter;
diff --git a/java/tests/src/com/android/intentresolver/GenericMultiProfilePagerAdapterTest.kt b/java/tests/src/com/android/intentresolver/MultiProfilePagerAdapterTest.kt
index d8e1e4b9..dcf53cea 100644
--- a/java/tests/src/com/android/intentresolver/GenericMultiProfilePagerAdapterTest.kt
+++ b/java/tests/src/com/android/intentresolver/MultiProfilePagerAdapterTest.kt
@@ -20,8 +20,8 @@ import android.os.UserHandle
 import android.view.View
 import android.widget.ListView
 import androidx.test.platform.app.InstrumentationRegistry
-import com.android.intentresolver.AbstractMultiProfilePagerAdapter.PROFILE_PERSONAL
-import com.android.intentresolver.AbstractMultiProfilePagerAdapter.PROFILE_WORK
+import com.android.intentresolver.MultiProfilePagerAdapter.PROFILE_PERSONAL
+import com.android.intentresolver.MultiProfilePagerAdapter.PROFILE_WORK
 import com.google.common.collect.ImmutableList
 import com.google.common.truth.Truth.assertThat
 import java.util.Optional
@@ -29,7 +29,7 @@ import org.junit.Test
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
 
-class GenericMultiProfilePagerAdapterTest {
+class MultiProfilePagerAdapterTest {
     private val PERSONAL_USER_HANDLE = UserHandle.of(10)
     private val WORK_USER_HANDLE = UserHandle.of(20)
 
@@ -40,14 +40,13 @@ class GenericMultiProfilePagerAdapterTest {
         val personalListAdapter =
             mock<ResolverListAdapter> { whenever(getUserHandle()).thenReturn(PERSONAL_USER_HANDLE) }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(personalListAdapter),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { false },
                 PROFILE_PERSONAL,
                 null,
@@ -75,14 +74,13 @@ class GenericMultiProfilePagerAdapterTest {
         val workListAdapter =
             mock<ResolverListAdapter> { whenever(getUserHandle()).thenReturn(WORK_USER_HANDLE) }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(personalListAdapter, workListAdapter),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { false },
                 PROFILE_PERSONAL,
                 WORK_USER_HANDLE, // TODO: why does this test pass even if this is null?
@@ -115,14 +113,13 @@ class GenericMultiProfilePagerAdapterTest {
         val workListAdapter =
             mock<ResolverListAdapter> { whenever(getUserHandle()).thenReturn(WORK_USER_HANDLE) }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(personalListAdapter, workListAdapter),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { false },
                 PROFILE_WORK, // <-- This test specifically requests we start on work profile.
                 WORK_USER_HANDLE, // TODO: why does this test pass even if this is null?
@@ -156,14 +153,13 @@ class GenericMultiProfilePagerAdapterTest {
                 whenever(getPaddingBottom()).thenReturn(4)
             }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { false },
                 PROFILE_PERSONAL,
                 null,
@@ -185,14 +181,13 @@ class GenericMultiProfilePagerAdapterTest {
                 whenever(getPaddingBottom()).thenReturn(4)
             }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { false },
                 PROFILE_PERSONAL,
                 null,
@@ -220,14 +215,13 @@ class GenericMultiProfilePagerAdapterTest {
                 whenever(getUnfilteredCount()).thenReturn(1)
             }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(personalListAdapter, workListAdapter),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { true }, // <-- Work mode is quiet.
                 PROFILE_WORK,
                 WORK_USER_HANDLE,
@@ -255,14 +249,13 @@ class GenericMultiProfilePagerAdapterTest {
                 whenever(getUnfilteredCount()).thenReturn(1)
             }
         val pagerAdapter =
-            GenericMultiProfilePagerAdapter(
-                context,
+            MultiProfilePagerAdapter(
                 { listAdapter: ResolverListAdapter -> listAdapter },
                 { listView: ListView, bindAdapter: ResolverListAdapter ->
                     listView.setAdapter(bindAdapter)
                 },
                 ImmutableList.of(personalListAdapter, workListAdapter),
-                object : AbstractMultiProfilePagerAdapter.EmptyStateProvider {},
+                object : MultiProfilePagerAdapter.EmptyStateProvider {},
                 { false }, // <-- Work mode is not quiet.
                 PROFILE_WORK,
                 WORK_USER_HANDLE,
diff --git a/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java b/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
index 1bb05437..d4bd123a 100644
--- a/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
+++ b/java/tests/src/com/android/intentresolver/ResolverWrapperActivity.java
@@ -34,7 +34,7 @@ import android.util.Pair;
 import androidx.annotation.NonNull;
 import androidx.test.espresso.idling.CountingIdlingResource;
 
-import com.android.intentresolver.AbstractMultiProfilePagerAdapter.CrossProfileIntentsChecker;
+import com.android.intentresolver.MultiProfilePagerAdapter.CrossProfileIntentsChecker;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.SelectableTargetInfo;
 import com.android.intentresolver.chooser.TargetInfo;