Rename @Profile to @ProfileType
This is a temporary step before introducing a new data class
to represent a Profile which will also carry a type
identifier within.
This is a name only change with no functional changes.
Bug: 309960444
Test: atest IntentResolver-tests-unit
Change-Id: I40e09b2b59005b3d91ea310aff1137813230733f
diff --git a/java/src/com/android/intentresolver/v2/ChooserActivity.java b/java/src/com/android/intentresolver/v2/ChooserActivity.java
index a71de19..343e1af 100644
--- a/java/src/com/android/intentresolver/v2/ChooserActivity.java
+++ b/java/src/com/android/intentresolver/v2/ChooserActivity.java
@@ -138,7 +138,7 @@
import com.android.intentresolver.model.ResolverRankerServiceResolverComparator;
import com.android.intentresolver.shortcuts.AppPredictorFactory;
import com.android.intentresolver.shortcuts.ShortcutLoader;
-import com.android.intentresolver.v2.MultiProfilePagerAdapter.Profile;
+import com.android.intentresolver.v2.MultiProfilePagerAdapter.ProfileType;
import com.android.intentresolver.v2.data.repository.DevicePolicyResources;
import com.android.intentresolver.v2.emptystate.NoAppsAvailableEmptyStateProvider;
import com.android.intentresolver.v2.emptystate.NoCrossProfileEmptyStateProvider;
@@ -1132,7 +1132,7 @@
() -> onProfileTabSelected(viewPager.getCurrentItem()),
new MultiProfilePagerAdapter.OnProfileSelectedListener() {
@Override
- public void onProfilePageSelected(@Profile int profileId, int pageNumber) {}
+ public void onProfilePageSelected(@ProfileType int profileId, int pageNumber) {}
@Override
public void onProfilePageStateChanged(int state) {
diff --git a/java/src/com/android/intentresolver/v2/ChooserMultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/v2/ChooserMultiProfilePagerAdapter.java
index 14532b6..7bbeedc 100644
--- a/java/src/com/android/intentresolver/v2/ChooserMultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/v2/ChooserMultiProfilePagerAdapter.java
@@ -91,7 +91,7 @@
ChooserGridAdapter workAdapter,
EmptyStateProvider emptyStateProvider,
Supplier<Boolean> workProfileQuietModeChecker,
- @Profile int defaultProfile,
+ @ProfileType int defaultProfile,
UserHandle workProfileUserHandle,
UserHandle cloneProfileUserHandle,
int maxTargetsPerRow,
@@ -127,7 +127,7 @@
ImmutableList<TabConfig<ChooserGridAdapter>> tabs,
EmptyStateProvider emptyStateProvider,
Supplier<Boolean> workProfileQuietModeChecker,
- @Profile int defaultProfile,
+ @ProfileType int defaultProfile,
UserHandle workProfileUserHandle,
UserHandle cloneProfileUserHandle,
BottomPaddingOverrideSupplier bottomPaddingOverrideSupplier,
diff --git a/java/src/com/android/intentresolver/v2/MultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/v2/MultiProfilePagerAdapter.java
index 2883542..7940309 100644
--- a/java/src/com/android/intentresolver/v2/MultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/v2/MultiProfilePagerAdapter.java
@@ -93,7 +93,7 @@
public static final int PROFILE_WORK = 1;
@IntDef({PROFILE_PERSONAL, PROFILE_WORK})
- public @interface Profile {}
+ public @interface ProfileType {}
private final Function<SinglePageAdapterT, ListAdapterT> mListAdapterExtractor;
private final AdapterBinder<PageViewT, SinglePageAdapterT> mAdapterBinder;
@@ -111,14 +111,14 @@
private OnProfileSelectedListener mOnProfileSelectedListener;
public static class TabConfig<PageAdapterT> {
- private final @Profile int mProfile;
+ private final @ProfileType int mProfile;
private final String mTabLabel;
private final String mTabAccessibilityLabel;
private final String mTabTag;
private final PageAdapterT mPageAdapter;
public TabConfig(
- @Profile int profile,
+ @ProfileType int profile,
String tabLabel,
String tabAccessibilityLabel,
String tabTag,
@@ -137,7 +137,7 @@
ImmutableList<TabConfig<SinglePageAdapterT>> tabs,
EmptyStateProvider emptyStateProvider,
Supplier<Boolean> workProfileQuietModeChecker,
- @Profile int defaultProfile,
+ @ProfileType int defaultProfile,
UserHandle workProfileUserHandle,
UserHandle cloneProfileUserHandle,
Supplier<ViewGroup> pageViewInflater,
@@ -174,7 +174,7 @@
}
private ProfileDescriptor<PageViewT, SinglePageAdapterT> createProfileDescriptor(
- @Profile int profile,
+ @ProfileType int profile,
String tabLabel,
String tabAccessibilityLabel,
String tabTag,
@@ -194,18 +194,18 @@
return (pageIndex >= 0) && (pageIndex < getCount());
}
- public final boolean hasPageForProfile(@Profile int profile) {
+ public final boolean hasPageForProfile(@ProfileType int profile) {
return hasPageForIndex(getPageNumberForProfile(profile));
}
- private @Profile int getProfileForPageNumber(int position) {
+ private @ProfileType int getProfileForPageNumber(int position) {
if (hasPageForIndex(position)) {
return mItems.get(position).mProfile;
}
return -1;
}
- public int getPageNumberForProfile(@Profile int profile) {
+ public int getPageNumberForProfile(@ProfileType int profile) {
for (int i = 0; i < mItems.size(); ++i) {
if (profile == mItems.get(i).mProfile) {
return i;
@@ -222,7 +222,7 @@
return mListAdapterExtractor.apply(pageAdapter);
}
- private @Profile int getProfileForUserHandle(UserHandle userHandle) {
+ private @ProfileType int getProfileForUserHandle(UserHandle userHandle) {
if (userHandle.equals(getCloneUserHandle())) {
// TODO: can we push this special case elsewhere -- e.g., when we check against each
// list adapter's user handle in the loop below, could we instead ask the list adapter
@@ -327,7 +327,7 @@
mOnProfileSelectedListener =
new MultiProfilePagerAdapter.OnProfileSelectedListener() {
@Override
- public void onProfilePageSelected(@Profile int profileId, int pageNumber) {
+ public void onProfilePageSelected(@ProfileType int profileId, int pageNumber) {
tabHost.setCurrentTab(pageNumber);
clientOnProfileSelectedListener.onProfilePageSelected(
profileId, pageNumber);
@@ -398,7 +398,7 @@
return mCurrentPage;
}
- public final @Profile int getActiveProfile() {
+ public final @ProfileType int getActiveProfile() {
return getProfileForPageNumber(getCurrentPage());
}
@@ -753,7 +753,7 @@
// TODO: `ChooserActivity` also has a per-profile record type. Maybe the "multi-profile pager"
// should be the owner of all per-profile data (especially now that the API is generic)?
private static class ProfileDescriptor<PageViewT, SinglePageAdapterT> {
- final @Profile int mProfile;
+ final @ProfileType int mProfile;
final String mTabLabel;
final String mTabAccessibilityLabel;
final String mTabTag;
@@ -769,7 +769,7 @@
private final PageViewT mView;
ProfileDescriptor(
- @Profile int forProfile,
+ @ProfileType int forProfile,
String tabLabel,
String tabAccessibilityLabel,
String tabTag,
@@ -809,7 +809,7 @@
* if the personal profile tab was selected or {@link #PROFILE_WORK} if the work profile tab
* was selected.
*/
- void onProfilePageSelected(@Profile int profileId, int pageNumber);
+ void onProfilePageSelected(@ProfileType int profileId, int pageNumber);
/**
diff --git a/java/src/com/android/intentresolver/v2/ResolverActivity.java b/java/src/com/android/intentresolver/v2/ResolverActivity.java
index 0e526b4..1450a88 100644
--- a/java/src/com/android/intentresolver/v2/ResolverActivity.java
+++ b/java/src/com/android/intentresolver/v2/ResolverActivity.java
@@ -100,7 +100,7 @@
import com.android.intentresolver.icons.TargetDataLoader;
import com.android.intentresolver.model.ResolverRankerServiceResolverComparator;
import com.android.intentresolver.v2.MultiProfilePagerAdapter.OnSwitchOnWorkSelectedListener;
-import com.android.intentresolver.v2.MultiProfilePagerAdapter.Profile;
+import com.android.intentresolver.v2.MultiProfilePagerAdapter.ProfileType;
import com.android.intentresolver.v2.data.repository.DevicePolicyResources;
import com.android.intentresolver.v2.emptystate.NoAppsAvailableEmptyStateProvider;
import com.android.intentresolver.v2.emptystate.NoCrossProfileEmptyStateProvider;
@@ -1049,7 +1049,7 @@
return selectedProfile;
}
- protected final @Profile int getCurrentProfile() {
+ protected final @ProfileType int getCurrentProfile() {
UserHandle launchUser = requireAnnotatedUserHandles().tabOwnerUserHandleForLaunch;
UserHandle personalUser = requireAnnotatedUserHandles().personalProfileUserHandle;
return launchUser.equals(personalUser) ? PROFILE_PERSONAL : PROFILE_WORK;
@@ -1866,7 +1866,7 @@
() -> onProfileTabSelected(viewPager.getCurrentItem()),
new MultiProfilePagerAdapter.OnProfileSelectedListener() {
@Override
- public void onProfilePageSelected(@Profile int profileId, int pageNumber) {
+ public void onProfilePageSelected(@ProfileType int profileId, int pageNumber) {
resetButtonBar();
resetCheckedItem();
}
diff --git a/java/src/com/android/intentresolver/v2/ResolverMultiProfilePagerAdapter.java b/java/src/com/android/intentresolver/v2/ResolverMultiProfilePagerAdapter.java
index 4c1358e..9c98d57 100644
--- a/java/src/com/android/intentresolver/v2/ResolverMultiProfilePagerAdapter.java
+++ b/java/src/com/android/intentresolver/v2/ResolverMultiProfilePagerAdapter.java
@@ -78,7 +78,7 @@
ResolverListAdapter workAdapter,
EmptyStateProvider emptyStateProvider,
Supplier<Boolean> workProfileQuietModeChecker,
- @Profile int defaultProfile,
+ @ProfileType int defaultProfile,
UserHandle workProfileUserHandle,
UserHandle cloneProfileUserHandle) {
this(
@@ -109,7 +109,7 @@
ImmutableList<TabConfig<ResolverListAdapter>> tabs,
EmptyStateProvider emptyStateProvider,
Supplier<Boolean> workProfileQuietModeChecker,
- @Profile int defaultProfile,
+ @ProfileType int defaultProfile,
UserHandle workProfileUserHandle,
UserHandle cloneProfileUserHandle,
BottomPaddingOverrideSupplier bottomPaddingOverrideSupplier) {
