[emptystate] Extract static inner classes to top level

Test: NA
Flag: EXEMPT refactor
Bug: 300157408
Change-Id: I5b9750f3b7b6ca1679bbf741c1b5466601d6914b

8 files changed, 199 insertions, 135 deletions

diff --git a/java/src/com/android/intentresolver/ChooserActivity.java b/java/src/com/android/intentresolver/ChooserActivity.java
index 56873302..ccf2a3dc 100644
--- a/java/src/com/android/intentresolver/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/ChooserActivity.java
@@ -111,11 +111,11 @@ import com.android.intentresolver.data.repository.DevicePolicyResources;
 import com.android.intentresolver.domain.interactor.UserInteractor;
 import com.android.intentresolver.emptystate.CompositeEmptyStateProvider;
 import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
+import com.android.intentresolver.emptystate.DevicePolicyBlockerEmptyState;
 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.grid.ChooserGridAdapter;
 import com.android.intentresolver.icons.TargetDataLoader;
diff --git a/java/src/com/android/intentresolver/ResolverActivity.java b/java/src/com/android/intentresolver/ResolverActivity.java
index 4e763f94..1b08d957 100644
--- a/java/src/com/android/intentresolver/ResolverActivity.java
+++ b/java/src/com/android/intentresolver/ResolverActivity.java
@@ -94,11 +94,11 @@ import com.android.intentresolver.data.repository.DevicePolicyResources;
 import com.android.intentresolver.domain.interactor.UserInteractor;
 import com.android.intentresolver.emptystate.CompositeEmptyStateProvider;
 import com.android.intentresolver.emptystate.CrossProfileIntentsChecker;
+import com.android.intentresolver.emptystate.DevicePolicyBlockerEmptyState;
 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;
diff --git a/java/src/com/android/intentresolver/emptystate/DevicePolicyBlockerEmptyState.java b/java/src/com/android/intentresolver/emptystate/DevicePolicyBlockerEmptyState.java
new file mode 100644
index 00000000..b627636e
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/DevicePolicyBlockerEmptyState.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2024 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.app.admin.DevicePolicyEventLogger;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+/**
+ * Empty state that gets strings from the device policy manager and tracks events into
+ * event logger of the device policy events.
+ */
+public class DevicePolicyBlockerEmptyState implements EmptyState {
+
+    @NonNull
+    private final Context mContext;
+    private final String mDevicePolicyStringTitleId;
+    @StringRes
+    private final int mDefaultTitleResource;
+    private final String mDevicePolicyStringSubtitleId;
+    @StringRes
+    private final int mDefaultSubtitleResource;
+    private final int mEventId;
+    @NonNull
+    private final String mEventCategory;
+
+    public DevicePolicyBlockerEmptyState(@NonNull Context context,
+            String devicePolicyStringTitleId, @StringRes int defaultTitleResource,
+            String devicePolicyStringSubtitleId, @StringRes int defaultSubtitleResource,
+            int devicePolicyEventId, @NonNull String devicePolicyEventCategory) {
+        mContext = context;
+        mDevicePolicyStringTitleId = devicePolicyStringTitleId;
+        mDefaultTitleResource = defaultTitleResource;
+        mDevicePolicyStringSubtitleId = devicePolicyStringSubtitleId;
+        mDefaultSubtitleResource = defaultSubtitleResource;
+        mEventId = devicePolicyEventId;
+        mEventCategory = devicePolicyEventCategory;
+    }
+
+    @Nullable
+    @Override
+    public String getTitle() {
+        return mContext.getSystemService(DevicePolicyManager.class).getResources().getString(
+                mDevicePolicyStringTitleId,
+                () -> mContext.getString(mDefaultTitleResource));
+    }
+
+    @Nullable
+    @Override
+    public String getSubtitle() {
+        return mContext.getSystemService(DevicePolicyManager.class).getResources().getString(
+                mDevicePolicyStringSubtitleId,
+                () -> mContext.getString(mDefaultSubtitleResource));
+    }
+
+    @Override
+    public void onEmptyStateShown() {
+        DevicePolicyEventLogger.createEvent(mEventId)
+                .setStrings(mEventCategory)
+                .write();
+    }
+
+    @Override
+    public boolean shouldSkipDataRebuild() {
+        return true;
+    }
+}
diff --git a/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyState.java b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyState.java
new file mode 100644
index 00000000..b03c730a
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyState.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2024 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.app.admin.DevicePolicyEventLogger;
+import android.stats.devicepolicy.nano.DevicePolicyEnums;
+
+import androidx.annotation.NonNull;
+
+public class NoAppsAvailableEmptyState implements EmptyState {
+
+    @NonNull
+    private final String mTitle;
+
+    @NonNull
+    private final String mMetricsCategory;
+
+    private final boolean mIsPersonalProfile;
+
+    public NoAppsAvailableEmptyState(@NonNull String title, @NonNull String metricsCategory,
+            boolean isPersonalProfile) {
+        mTitle = title;
+        mMetricsCategory = metricsCategory;
+        mIsPersonalProfile = isPersonalProfile;
+    }
+
+    @NonNull
+    @Override
+    public String getTitle() {
+        return mTitle;
+    }
+
+    @Override
+    public void onEmptyStateShown() {
+        DevicePolicyEventLogger.createEvent(
+                        DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_APPS_RESOLVED)
+                .setStrings(mMetricsCategory)
+                .setBoolean(/*isPersonalProfile*/ mIsPersonalProfile)
+                .write();
+    }
+}
diff --git a/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java
index af9d56d1..cd1448e4 100644
--- a/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/NoAppsAvailableEmptyStateProvider.java
@@ -21,9 +21,7 @@ import static com.android.intentresolver.shared.model.Profile.Type.PERSONAL;
 
 import static java.util.Objects.requireNonNull;
 
-import android.app.admin.DevicePolicyEventLogger;
 import android.os.UserHandle;
-import android.stats.devicepolicy.nano.DevicePolicyEnums;
 
 import androidx.annotation.NonNull;
 
@@ -81,36 +79,4 @@ public class NoAppsAvailableEmptyStateProvider implements EmptyStateProvider {
         }
     }
 
-    public static class NoAppsAvailableEmptyState implements EmptyState {
-
-        @NonNull
-        private final String mTitle;
-
-        @NonNull
-        private final String mMetricsCategory;
-
-        private final boolean mIsPersonalProfile;
-
-        public NoAppsAvailableEmptyState(@NonNull String title, @NonNull String metricsCategory,
-                boolean isPersonalProfile) {
-            mTitle = title;
-            mMetricsCategory = metricsCategory;
-            mIsPersonalProfile = isPersonalProfile;
-        }
-
-        @NonNull
-        @Override
-        public String getTitle() {
-            return mTitle;
-        }
-
-        @Override
-        public void onEmptyStateShown() {
-            DevicePolicyEventLogger.createEvent(
-                            DevicePolicyEnums.RESOLVER_EMPTY_STATE_NO_APPS_RESOLVED)
-                    .setStrings(mMetricsCategory)
-                    .setBoolean(/*isPersonalProfile*/ mIsPersonalProfile)
-                    .write();
-        }
-    }
 }
diff --git a/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
index 2b4a7ada..fa33928b 100644
--- a/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/NoCrossProfileEmptyStateProvider.java
@@ -16,15 +16,10 @@
 
 package com.android.intentresolver.emptystate;
 
-import android.app.admin.DevicePolicyEventLogger;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
 import android.content.Intent;
 import android.os.UserHandle;
 
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 
 import com.android.intentresolver.ProfileHelper;
 import com.android.intentresolver.ResolverListAdapter;
@@ -91,63 +86,4 @@ public class NoCrossProfileEmptyStateProvider implements EmptyStateProvider {
         return null;
     }
 
-    /**
-     * Empty state that gets strings from the device policy manager and tracks events into
-     * event logger of the device policy events.
-     */
-    public static class DevicePolicyBlockerEmptyState implements EmptyState {
-
-        @NonNull
-        private final Context mContext;
-        private final String mDevicePolicyStringTitleId;
-        @StringRes
-        private final int mDefaultTitleResource;
-        private final String mDevicePolicyStringSubtitleId;
-        @StringRes
-        private final int mDefaultSubtitleResource;
-        private final int mEventId;
-        @NonNull
-        private final String mEventCategory;
-
-        public DevicePolicyBlockerEmptyState(@NonNull Context context,
-                String devicePolicyStringTitleId, @StringRes int defaultTitleResource,
-                String devicePolicyStringSubtitleId, @StringRes int defaultSubtitleResource,
-                int devicePolicyEventId, @NonNull String devicePolicyEventCategory) {
-            mContext = context;
-            mDevicePolicyStringTitleId = devicePolicyStringTitleId;
-            mDefaultTitleResource = defaultTitleResource;
-            mDevicePolicyStringSubtitleId = devicePolicyStringSubtitleId;
-            mDefaultSubtitleResource = defaultSubtitleResource;
-            mEventId = devicePolicyEventId;
-            mEventCategory = devicePolicyEventCategory;
-        }
-
-        @Nullable
-        @Override
-        public String getTitle() {
-            return mContext.getSystemService(DevicePolicyManager.class).getResources().getString(
-                    mDevicePolicyStringTitleId,
-                    () -> mContext.getString(mDefaultTitleResource));
-        }
-
-        @Nullable
-        @Override
-        public String getSubtitle() {
-            return mContext.getSystemService(DevicePolicyManager.class).getResources().getString(
-                    mDevicePolicyStringSubtitleId,
-                    () -> mContext.getString(mDefaultSubtitleResource));
-        }
-
-        @Override
-        public void onEmptyStateShown() {
-            DevicePolicyEventLogger.createEvent(mEventId)
-                    .setStrings(mEventCategory)
-                    .write();
-        }
-
-        @Override
-        public boolean shouldSkipDataRebuild() {
-            return true;
-        }
-    }
 }
diff --git a/java/src/com/android/intentresolver/emptystate/WorkProfileOffEmptyState.java b/java/src/com/android/intentresolver/emptystate/WorkProfileOffEmptyState.java
new file mode 100644
index 00000000..e9de3221
--- /dev/null
+++ b/java/src/com/android/intentresolver/emptystate/WorkProfileOffEmptyState.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2024 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.app.admin.DevicePolicyEventLogger;
+import android.stats.devicepolicy.nano.DevicePolicyEnums;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public class WorkProfileOffEmptyState implements EmptyState {
+
+    private final String mTitle;
+    private final ClickListener mOnClick;
+    private final String mMetricsCategory;
+
+    public WorkProfileOffEmptyState(String title, @NonNull ClickListener onClick,
+            @NonNull String metricsCategory) {
+        mTitle = title;
+        mOnClick = onClick;
+        mMetricsCategory = metricsCategory;
+    }
+
+    @Nullable
+    @Override
+    public String getTitle() {
+        return mTitle;
+    }
+
+    @Nullable
+    @Override
+    public ClickListener getButtonClickListener() {
+        return mOnClick;
+    }
+
+    @Override
+    public void onEmptyStateShown() {
+        DevicePolicyEventLogger
+                .createEvent(DevicePolicyEnums.RESOLVER_EMPTY_STATE_WORK_APPS_DISABLED)
+                .setStrings(mMetricsCategory)
+                .write();
+    }
+}
diff --git a/java/src/com/android/intentresolver/emptystate/WorkProfilePausedEmptyStateProvider.java b/java/src/com/android/intentresolver/emptystate/WorkProfilePausedEmptyStateProvider.java
index cef88ce3..f78d1ca2 100644
--- a/java/src/com/android/intentresolver/emptystate/WorkProfilePausedEmptyStateProvider.java
+++ b/java/src/com/android/intentresolver/emptystate/WorkProfilePausedEmptyStateProvider.java
@@ -20,11 +20,9 @@ import static android.app.admin.DevicePolicyResources.Strings.Core.RESOLVER_WORK
 
 import static java.util.Objects.requireNonNull;
 
-import android.app.admin.DevicePolicyEventLogger;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.os.UserHandle;
-import android.stats.devicepolicy.nano.DevicePolicyEnums;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -93,37 +91,4 @@ public class WorkProfilePausedEmptyStateProvider implements EmptyStateProvider {
         }, mMetricsCategory);
     }
 
-    public static class WorkProfileOffEmptyState implements EmptyState {
-
-        private final String mTitle;
-        private final ClickListener mOnClick;
-        private final String mMetricsCategory;
-
-        public WorkProfileOffEmptyState(String title, @NonNull ClickListener onClick,
-                @NonNull String metricsCategory) {
-            mTitle = title;
-            mOnClick = onClick;
-            mMetricsCategory = metricsCategory;
-        }
-
-        @Nullable
-        @Override
-        public String getTitle() {
-            return mTitle;
-        }
-
-        @Nullable
-        @Override
-        public ClickListener getButtonClickListener() {
-            return mOnClick;
-        }
-
-        @Override
-        public void onEmptyStateShown() {
-            DevicePolicyEventLogger
-                    .createEvent(DevicePolicyEnums.RESOLVER_EMPTY_STATE_WORK_APPS_DISABLED)
-                    .setStrings(mMetricsCategory)
-                    .write();
-        }
-    }
 }