Merge "Begin extracting `emptystate` module." into main

14 files changed, 259 insertions, 165 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 7b4f4827..182cfafe 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -73,9 +73,6 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyState;
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyStateProvider;
-import com.android.intentresolver.NoCrossProfileEmptyStateProvider.DevicePolicyBlockerEmptyState;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.MultiDisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
@@ -83,6 +80,10 @@ import com.android.intentresolver.contentpreview.BasePreviewViewModel;
 import com.android.intentresolver.contentpreview.ChooserContentPreviewUi;
 import com.android.intentresolver.contentpreview.HeadlineGeneratorImpl;
 import com.android.intentresolver.contentpreview.PreviewViewModel;
+import com.android.intentresolver.emptystate.EmptyState;
+import com.android.intentresolver.emptystate.EmptyStateProvider;
+import com.android.intentresolver.emptystate.NoCrossProfileEmptyStateProvider;
+import com.android.intentresolver.emptystate.NoCrossProfileEmptyStateProvider.DevicePolicyBlockerEmptyState;
 import com.android.intentresolver.grid.ChooserGridAdapter;
 import com.android.intentresolver.icons.DefaultTargetDataLoader;
 import com.android.intentresolver.icons.TargetDataLoader;
diff --git a/java/src/com/android/intentresolver/ChooserMultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/ChooserMultiProfilePagerAdapter.java
index 75ff3a7f..23a081d2 100644
--- a/java/src/com/android/intentresolver/ChooserMultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/ChooserMultiProfilePagerAdapter.java
@@ -25,6 +25,7 @@ import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.PagerAdapter;
 
+import com.android.intentresolver.emptystate.EmptyStateProvider;
 import com.android.intentresolver.grid.ChooserGridAdapter;
 import com.android.intentresolver.measurements.Tracer;
 import com.android.internal.annotations.VisibleForTesting;
diff --git a/java/src/com/android/intentresolver/IntentForwarderActivity.java b/java/src/com/android/intentresolver/IntentForwarderActivity.java
index 5e8945f1..acee1316 100644
--- a/java/src/com/android/intentresolver/IntentForwarderActivity.java
+++ b/java/src/com/android/intentresolver/IntentForwarderActivity.java
@@ -309,7 +309,7 @@ public class IntentForwarderActivity extends Activity  {
      * Check whether the intent can be forwarded to target user. Return the intent used for
      * forwarding if it can be forwarded, {@code null} otherwise.
      */
-    static Intent canForward(Intent incomingIntent, int sourceUserId, int targetUserId,
+    public static Intent canForward(Intent incomingIntent, int sourceUserId, int targetUserId,
             IPackageManager packageManager, ContentResolver contentResolver)  {
         Intent forwardIntent = new Intent(incomingIntent);
         forwardIntent.addFlags(
diff --git a/java/src/com/android/intentresolver/MultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/MultiProfilePagerAdapter.java
index cc079a87..2c98d89f 100644
--- a/java/src/com/android/intentresolver/MultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/MultiProfilePagerAdapter.java
@@ -16,14 +16,7 @@
 package com.android.intentresolver;
 
 import android.annotation.IntDef;
-import android.annotation.NonNull;
 import android.annotation.Nullable;
-import android.annotation.UserIdInt;
-import android.app.AppGlobals;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.IPackageManager;
 import android.os.Trace;
 import android.os.UserHandle;
 import android.view.View;
@@ -34,13 +27,13 @@ import android.widget.TextView;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import com.android.intentresolver.emptystate.EmptyState;
+import com.android.intentresolver.emptystate.EmptyStateProvider;
 import com.android.internal.annotations.VisibleForTesting;
 
 import com.google.common.collect.ImmutableList;
 
 import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
@@ -450,32 +443,6 @@ public class MultiProfilePagerAdapter<
         }
     }
 
-    /**
-     * Utility class to check if there are cross profile intents, it is in a separate class so
-     * it could be mocked in tests
-     */
-    public static class CrossProfileIntentsChecker {
-
-        private final ContentResolver mContentResolver;
-
-        public CrossProfileIntentsChecker(@NonNull ContentResolver contentResolver) {
-            mContentResolver = contentResolver;
-        }
-
-        /**
-         * Returns {@code true} if at least one of the provided {@code intents} can be forwarded
-         * from {@code source} (user id) to {@code target} (user id).
-         */
-        public boolean hasCrossProfileIntents(List<Intent> intents, @UserIdInt int source,
-                @UserIdInt int target) {
-            IPackageManager packageManager = AppGlobals.getPackageManager();
-
-            return intents.stream().anyMatch(intent ->
-                    null != IntentForwarderActivity.canForward(intent, source, target,
-                            packageManager, mContentResolver));
-        }
-    }
-
     protected void showEmptyState(
             ListAdapterT activeListAdapter,
             EmptyState emptyState,
@@ -621,108 +588,6 @@ public class MultiProfilePagerAdapter<
     }
 
     /**
-     * Returns an empty state to show for the current profile page (tab) if necessary.
-     * This could be used e.g. to show a blocker on a tab if device management policy doesn't
-     * allow to use it or there are no apps available.
-     */
-    public interface EmptyStateProvider {
-        /**
-         * When a non-null empty state is returned the corresponding profile page will show
-         * this empty state
-         * @param resolverListAdapter the current adapter
-         */
-        @Nullable
-        default EmptyState getEmptyState(ResolverListAdapter resolverListAdapter) {
-            return null;
-        }
-    }
-
-    /**
-     * Empty state provider that combines multiple providers. Providers earlier in the list have
-     * priority, that is if there is a provider that returns non-null empty state then all further
-     * providers will be ignored.
-     */
-    public static class CompositeEmptyStateProvider implements EmptyStateProvider {
-
-        private final EmptyStateProvider[] mProviders;
-
-        public CompositeEmptyStateProvider(EmptyStateProvider... providers) {
-            mProviders = providers;
-        }
-
-        @Nullable
-        @Override
-        public EmptyState getEmptyState(ResolverListAdapter resolverListAdapter) {
-            for (EmptyStateProvider provider : mProviders) {
-                EmptyState emptyState = provider.getEmptyState(resolverListAdapter);
-                if (emptyState != null) {
-                    return emptyState;
-                }
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Describes how the blocked empty state should look like for a profile tab
-     */
-    public interface EmptyState {
-        /**
-         * Title that will be shown on the empty state
-         */
-        @Nullable
-        default String getTitle() {
-            return null;
-        }
-
-        /**
-         * Subtitle that will be shown underneath the title on the empty state
-         */
-        @Nullable
-        default String getSubtitle()  {
-            return null;
-        }
-
-        /**
-         * If non-null then a button will be shown and this listener will be called
-         * when the button is clicked
-         */
-        @Nullable
-        default ClickListener getButtonClickListener()  {
-            return null;
-        }
-
-        /**
-         * If true then default text ('No apps can perform this action') and style for the empty
-         * state will be applied, title and subtitle will be ignored.
-         */
-        default boolean useDefaultEmptyView() {
-            return false;
-        }
-
-        /**
-         * Returns true if for this empty state we should skip rebuilding of the apps list
-         * for this tab.
-         */
-        default boolean shouldSkipDataRebuild() {
-            return false;
-        }
-
-        /**
-         * Called when empty state is shown, could be used e.g. to track analytics events
-         */
-        default void onEmptyStateShown() {}
-
-        interface ClickListener {
-            void onClick(TabControl currentTab);
-        }
-
-        interface TabControl {
-            void showSpinner();
-        }
-    }
-
-    /**
      * Listener for when the user switches on the work profile from the work tab.
      */
     public interface OnSwitchOnWorkSelectedListener {
diff --git a/java/src/com/android/intentresolver/ResolverActivity.java b/java/src/com/android/intentresolver/ResolverActivity.java
index d1d86aff..aa9d051c 100644
--- a/java/src/com/android/intentresolver/ResolverActivity.java
+++ b/java/src/com/android/intentresolver/ResolverActivity.java
@@ -33,6 +33,7 @@ import static android.content.PermissionChecker.PID_UNKNOWN;
 import static android.stats.devicepolicy.nano.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_PERSONAL;
 import static android.stats.devicepolicy.nano.DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_SHARING_TO_WORK;
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
+
 import static com.android.internal.annotations.VisibleForTesting.Visibility.PROTECTED;
 
 import android.annotation.Nullable;
@@ -98,15 +99,19 @@ import android.widget.Toast;
 import androidx.fragment.app.FragmentActivity;
 import androidx.viewpager.widget.ViewPager;
 
-import com.android.intentresolver.MultiProfilePagerAdapter.CompositeEmptyStateProvider;
-import com.android.intentresolver.MultiProfilePagerAdapter.CrossProfileIntentsChecker;
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyStateProvider;
 import com.android.intentresolver.MultiProfilePagerAdapter.MyUserIdProvider;
 import com.android.intentresolver.MultiProfilePagerAdapter.OnSwitchOnWorkSelectedListener;
 import com.android.intentresolver.MultiProfilePagerAdapter.Profile;
-import com.android.intentresolver.NoCrossProfileEmptyStateProvider.DevicePolicyBlockerEmptyState;
 import com.android.intentresolver.chooser.DisplayResolveInfo;
 import com.android.intentresolver.chooser.TargetInfo;
+import com.android.intentresolver.emptystate.CompositeEmptyStateProvider;
+import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
+import com.android.intentresolver.emptystate.EmptyState;
+import com.android.intentresolver.emptystate.EmptyStateProvider;
+import com.android.intentresolver.emptystate.NoAppsAvailableEmptyStateProvider;
+import com.android.intentresolver.emptystate.NoCrossProfileEmptyStateProvider;
+import com.android.intentresolver.emptystate.NoCrossProfileEmptyStateProvider.DevicePolicyBlockerEmptyState;
+import com.android.intentresolver.emptystate.WorkProfilePausedEmptyStateProvider;
 import com.android.intentresolver.icons.DefaultTargetDataLoader;
 import com.android.intentresolver.icons.TargetDataLoader;
 import com.android.intentresolver.model.ResolverRankerServiceResolverComparator;
@@ -521,9 +526,9 @@ public class ResolverActivity extends FragmentActivity implements
             return new EmptyStateProvider() {};
         }
 
-        final MultiProfilePagerAdapter.EmptyState
-                noWorkToPersonalEmptyState =
-                new DevicePolicyBlockerEmptyState(/* context= */ this,
+        final EmptyState noWorkToPersonalEmptyState =
+                new DevicePolicyBlockerEmptyState(
+                        /* context= */ this,
                         /* devicePolicyStringTitleId= */ RESOLVER_CROSS_PROFILE_BLOCKED_TITLE,
                         /* defaultTitleResource= */ R.string.resolver_cross_profile_blocked,
                         /* devicePolicyStringSubtitleId= */ RESOLVER_CANT_ACCESS_PERSONAL,
@@ -533,8 +538,9 @@ public class ResolverActivity extends FragmentActivity implements
                         /* devicePolicyEventCategory= */
                                 ResolverActivity.METRICS_CATEGORY_RESOLVER);
 
-        final MultiProfilePagerAdapter.EmptyState noPersonalToWorkEmptyState =
-                new DevicePolicyBlockerEmptyState(/* context= */ this,
+        final EmptyState noPersonalToWorkEmptyState =
+                new DevicePolicyBlockerEmptyState(
+                        /* context= */ this,
                         /* devicePolicyStringTitleId= */ RESOLVER_CROSS_PROFILE_BLOCKED_TITLE,
                         /* defaultTitleResource= */ R.string.resolver_cross_profile_blocked,
                         /* devicePolicyStringSubtitleId= */ RESOLVER_CANT_ACCESS_WORK,
diff --git a/java/src/com/android/intentresolver/ResolverListAdapter.java b/java/src/com/android/intentresolver/ResolverListAdapter.java
index 0d199fa3..95ed0d5c 100644
--- a/java/src/com/android/intentresolver/ResolverListAdapter.java
+++ b/java/src/com/android/intentresolver/ResolverListAdapter.java
@@ -820,7 +820,7 @@ public class ResolverListAdapter extends BaseAdapter {
         return mUserHandle;
     }
 
-    protected List<ResolvedComponentInfo> getResolversForUser(UserHandle userHandle) {
+    public final List<ResolvedComponentInfo> getResolversForUser(UserHandle userHandle) {
         return mResolverListController.getResolversForIntentAsUser(
                 /* shouldGetResolvedFilter= */ true,
                 mResolverListCommunicator.shouldGetActivityMetadata(),
@@ -829,7 +829,8 @@ public class ResolverListAdapter extends BaseAdapter {
                 userHandle);
     }
 
-    protected List<Intent> getIntents() {
+    public final List<Intent> getIntents() {
+        // TODO: immutable copy?
         return mIntents;
     }
 
diff --git a/java/src/com/android/intentresolver/ResolverMultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/ResolverMultiProfilePagerAdapter.java
index 9fb35948..e0c5380f 100644
--- a/java/src/com/android/intentresolver/ResolverMultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/ResolverMultiProfilePagerAdapter.java
@@ -24,6 +24,7 @@ import android.widget.ListView;
 
 import androidx.viewpager.widget.PagerAdapter;
 
+import com.android.intentresolver.emptystate.EmptyStateProvider;
 import com.android.internal.annotations.VisibleForTesting;
 
 import com.google.common.collect.ImmutableList;
diff --git a/java/src/com/android/intentresolver/emptystate/CompositeEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/CompositeEmptyStateProvider.java
new file mode 100644
index 00000000..41422b66
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/CompositeEmptyStateProvider.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.intentresolver.emptystate;
+
+import android.annotation.Nullable;
+
+import com.android.intentresolver.ResolverListAdapter;
+
+/**
+ * Empty state provider that combines multiple providers. Providers earlier in the list have
+ * priority, that is if there is a provider that returns non-null empty state then all further
+ * providers will be ignored.
+ */
+public class CompositeEmptyStateProvider implements EmptyStateProvider {
+
+    private final EmptyStateProvider[] mProviders;
+
+    public CompositeEmptyStateProvider(EmptyStateProvider... providers) {
+        mProviders = providers;
+    }
+
+    @Nullable
+    @Override
+    public EmptyState getEmptyState(ResolverListAdapter resolverListAdapter) {
+        for (EmptyStateProvider provider : mProviders) {
+            EmptyState emptyState = provider.getEmptyState(resolverListAdapter);
+            if (emptyState != null) {
+                return emptyState;
+            }
+        }
+        return null;
+    }
+}
diff --git a/java/src/com/android/intentresolver/emptystate/CrossProfileIntentsChecker.java b/java/src/com/android/intentresolver/emptystate/CrossProfileIntentsChecker.java
new file mode 100644
index 00000000..2164e533
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/CrossProfileIntentsChecker.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.intentresolver.emptystate;
+
+import android.annotation.NonNull;
+import android.annotation.UserIdInt;
+import android.app.AppGlobals;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.content.pm.IPackageManager;
+
+import com.android.intentresolver.IntentForwarderActivity;
+
+import java.util.List;
+
+/**
+ * Utility class to check if there are cross profile intents, it is in a separate class so
+ * it could be mocked in tests
+ */
+public class CrossProfileIntentsChecker {
+
+    private final ContentResolver mContentResolver;
+    private final IPackageManager mPackageManager;
+
+    public CrossProfileIntentsChecker(@NonNull ContentResolver contentResolver) {
+        this(contentResolver, AppGlobals.getPackageManager());
+    }
+
+    CrossProfileIntentsChecker(
+            @NonNull ContentResolver contentResolver, IPackageManager packageManager) {
+        mContentResolver = contentResolver;
+        mPackageManager = packageManager;
+    }
+
+    /**
+     * Returns {@code true} if at least one of the provided {@code intents} can be forwarded
+     * from {@code source} (user id) to {@code target} (user id).
+     */
+    public boolean hasCrossProfileIntents(
+            List<Intent> intents, @UserIdInt int source, @UserIdInt int target) {
+        return intents.stream().anyMatch(intent ->
+                null != IntentForwarderActivity.canForward(intent, source, target,
+                        mPackageManager, mContentResolver));
+    }
+}
+
diff --git a/java/src/com/android/intentresolver/emptystate/EmptyState.java b/java/src/com/android/intentresolver/emptystate/EmptyState.java
new file mode 100644
index 00000000..cde99fe1
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/EmptyState.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.intentresolver.emptystate;
+
+import android.annotation.Nullable;
+
+/**
+ * Model for the "empty state"/"blocker" UI to display instead of a profile tab's normal contents.
+ */
+public interface EmptyState {
+    /**
+     * Get the title to show on the empty state.
+     */
+    @Nullable
+    default String getTitle() {
+        return null;
+    }
+
+    /**
+     * Get the subtitle string to show underneath the title on the empty state.
+     */
+    @Nullable
+    default String getSubtitle()  {
+        return null;
+    }
+
+    /**
+     * Get the handler for an optional button associated with this empty state. If the result is
+     * non-null, the empty-state UI will be built with a button that dispatches this handler.
+     */
+    @Nullable
+    default ClickListener getButtonClickListener()  {
+        return null;
+    }
+
+    /**
+     * Get whether to show the default UI for the empty state. If true, the UI will show the default
+     * blocker text ('No apps can perform this action') and style; title and subtitle are ignored.
+     */
+    default boolean useDefaultEmptyView() {
+        return false;
+    }
+
+    /**
+     * Returns true if for this empty state we should skip rebuilding of the apps list
+     * for this tab.
+     */
+    default boolean shouldSkipDataRebuild() {
+        return false;
+    }
+
+    /**
+     * Called when empty state is shown, could be used e.g. to track analytics events.
+     */
+    default void onEmptyStateShown() {}
+
+    interface ClickListener {
+        void onClick(TabControl currentTab);
+    }
+
+    interface TabControl {
+        void showSpinner();
+    }
+}
diff --git a/java/src/com/android/intentresolver/emptystate/EmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/EmptyStateProvider.java
new file mode 100644
index 00000000..c3261287
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/EmptyStateProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.intentresolver.emptystate;
+
+import android.annotation.Nullable;
+
+import com.android.intentresolver.ResolverListAdapter;
+
+/**
+ * Returns an empty state to show for the current profile page (tab) if necessary.
+ * This could be used e.g. to show a blocker on a tab if device management policy doesn't
+ * allow to use it or there are no apps available.
+ */
+public interface EmptyStateProvider {
+    /**
+     * When a non-null empty state is returned the corresponding profile page will show
+     * this empty state
+     * @param resolverListAdapter the current adapter
+     */
+    @Nullable
+    default EmptyState getEmptyState(ResolverListAdapter resolverListAdapter) {
+        return null;
+    }
+}
diff --git a/java/src/com/android/intentresolver/NoAppsAvailableEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java
index 1900abee..b7084466 100644
--- a/java/src/com/android/intentresolver/NoAppsAvailableEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver;
+package com.android.intentresolver.emptystate;
 
 import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_PERSONAL_APPS;
 import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_NO_WORK_APPS;
@@ -28,8 +28,8 @@ import android.content.pm.ResolveInfo;
 import android.os.UserHandle;
 import android.stats.devicepolicy.nano.DevicePolicyEnums;
 
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyState;
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyStateProvider;
+import com.android.intentresolver.ResolvedComponentInfo;
+import com.android.intentresolver.ResolverListAdapter;
 import com.android.internal.R;
 
 import java.util.List;
@@ -76,12 +76,12 @@ public class NoAppsAvailableEmptyStateProvider implements EmptyStateProvider {
                 title = mContext.getSystemService(
                         DevicePolicyManager.class).getResources().getString(
                         RESOLVER_NO_PERSONAL_APPS,
-                        () -> mContext.getString(R.string.resolver_no_personal_apps_available));
+                            () -> mContext.getString(R.string.resolver_no_personal_apps_available));
             } else {
                 title = mContext.getSystemService(
                         DevicePolicyManager.class).getResources().getString(
                         RESOLVER_NO_WORK_APPS,
-                        () -> mContext.getString(R.string.resolver_no_work_apps_available));
+                            () -> mContext.getString(R.string.resolver_no_work_apps_available));
             }
 
             return new NoAppsAvailableEmptyState(
diff --git a/java/src/com/android/intentresolver/NoCrossProfileEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
index ad262f0e..686027c3 100644
--- a/java/src/com/android/intentresolver/NoCrossProfileEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver;
+package com.android.intentresolver.emptystate;
 
 import android.annotation.NonNull;
 import android.annotation.Nullable;
@@ -24,9 +24,7 @@ import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.os.UserHandle;
 
-import com.android.intentresolver.MultiProfilePagerAdapter.CrossProfileIntentsChecker;
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyState;
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyStateProvider;
+import com.android.intentresolver.ResolverListAdapter;
 
 /**
  * Empty state provider that does not allow cross profile sharing, it will return a blocker
diff --git a/java/src/com/android/intentresolver/WorkProfilePausedEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/WorkProfilePausedEmptyStateProvider.java
index 9ea7ceee..ca04f1b7 100644
--- a/java/src/com/android/intentresolver/WorkProfilePausedEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/WorkProfilePausedEmptyStateProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.intentresolver;
+package com.android.intentresolver.emptystate;
 
 import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK_PAUSED_TITLE;
 
@@ -26,9 +26,10 @@ import android.content.Context;
 import android.os.UserHandle;
 import android.stats.devicepolicy.nano.DevicePolicyEnums;
 
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyState;
-import com.android.intentresolver.MultiProfilePagerAdapter.EmptyStateProvider;
 import com.android.intentresolver.MultiProfilePagerAdapter.OnSwitchOnWorkSelectedListener;
+import com.android.intentresolver.R;
+import com.android.intentresolver.ResolverListAdapter;
+import com.android.intentresolver.WorkProfileAvailabilityManager;
 
 /**
  * Chooser/ResolverActivity empty state provider that returns empty state which is shown when
@@ -65,7 +66,7 @@ public class WorkProfilePausedEmptyStateProvider implements EmptyStateProvider {
 
         final String title = mContext.getSystemService(DevicePolicyManager.class)
                 .getResources().getString(RESOLVER_WORK_PAUSED_TITLE,
-                () -> mContext.getString(R.string.resolver_turn_on_work_apps));
+                    () -> mContext.getString(R.string.resolver_turn_on_work_apps));
 
         return new WorkProfileOffEmptyState(title, (tab) -> {
             tab.showSpinner();