diff options
| -rw-r--r-- | java/src/com/android/intentresolver/v2/ResolverActivity.java | 2 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/v2/domain/interactor/UserInteractor.kt | 4 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/v2/shared/model/Profile.kt (renamed from java/src/com/android/intentresolver/v2/domain/model/Profile.kt) | 7 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/v2/ui/ProfilePagerResources.kt | 2 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/v2/ui/model/ResolverRequest.kt | 2 | ||||
| -rw-r--r-- | java/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestReader.kt | 2 | ||||
| -rw-r--r-- | tests/unit/src/com/android/intentresolver/v2/domain/interactor/UserInteractorTest.kt | 8 | ||||
| -rw-r--r-- | tests/unit/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestTest.kt | 2 |
8 files changed, 14 insertions, 15 deletions
diff --git a/java/src/com/android/intentresolver/v2/ResolverActivity.java b/java/src/com/android/intentresolver/v2/ResolverActivity.java index 2d26932f..241b6735 100644 --- a/java/src/com/android/intentresolver/v2/ResolverActivity.java +++ b/java/src/com/android/intentresolver/v2/ResolverActivity.java @@ -101,7 +101,7 @@ import com.android.intentresolver.icons.DefaultTargetDataLoader; import com.android.intentresolver.icons.TargetDataLoader; import com.android.intentresolver.model.ResolverRankerServiceResolverComparator; import com.android.intentresolver.v2.data.repository.DevicePolicyResources; -import com.android.intentresolver.v2.domain.model.Profile; +import com.android.intentresolver.v2.shared.model.Profile; import com.android.intentresolver.v2.emptystate.NoAppsAvailableEmptyStateProvider; import com.android.intentresolver.v2.emptystate.NoCrossProfileEmptyStateProvider; import com.android.intentresolver.v2.emptystate.NoCrossProfileEmptyStateProvider.DevicePolicyBlockerEmptyState; diff --git a/java/src/com/android/intentresolver/v2/domain/interactor/UserInteractor.kt b/java/src/com/android/intentresolver/v2/domain/interactor/UserInteractor.kt index f12d8197..c8df9684 100644 --- a/java/src/com/android/intentresolver/v2/domain/interactor/UserInteractor.kt +++ b/java/src/com/android/intentresolver/v2/domain/interactor/UserInteractor.kt @@ -19,8 +19,8 @@ package com.android.intentresolver.v2.domain.interactor import android.os.UserHandle import com.android.intentresolver.inject.ApplicationUser import com.android.intentresolver.v2.data.repository.UserRepository -import com.android.intentresolver.v2.domain.model.Profile -import com.android.intentresolver.v2.domain.model.Profile.Type +import com.android.intentresolver.v2.shared.model.Profile +import com.android.intentresolver.v2.shared.model.Profile.Type import com.android.intentresolver.v2.shared.model.User import com.android.intentresolver.v2.shared.model.User.Role import javax.inject.Inject diff --git a/java/src/com/android/intentresolver/v2/domain/model/Profile.kt b/java/src/com/android/intentresolver/v2/shared/model/Profile.kt index 46015c7a..6e37174c 100644 --- a/java/src/com/android/intentresolver/v2/domain/model/Profile.kt +++ b/java/src/com/android/intentresolver/v2/shared/model/Profile.kt @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.android.intentresolver.v2.domain.model +package com.android.intentresolver.v2.shared.model -import com.android.intentresolver.v2.domain.model.Profile.Type -import com.android.intentresolver.v2.shared.model.User +import com.android.intentresolver.v2.shared.model.Profile.Type /** - * A domain layer model which associates [users][User] into a [Type] instance. + * Associates [users][User] into a [Type] instance. * * This is a simple abstraction which combines a primary [user][User] with an optional * [cloned apps][User.Role.CLONE] user. This encapsulates the cloned app user id, while still being diff --git a/java/src/com/android/intentresolver/v2/ui/ProfilePagerResources.kt b/java/src/com/android/intentresolver/v2/ui/ProfilePagerResources.kt index 0d31b23e..1cd72ba5 100644 --- a/java/src/com/android/intentresolver/v2/ui/ProfilePagerResources.kt +++ b/java/src/com/android/intentresolver/v2/ui/ProfilePagerResources.kt @@ -19,7 +19,7 @@ package com.android.intentresolver.v2.ui import android.content.res.Resources import com.android.intentresolver.inject.ApplicationOwned import com.android.intentresolver.v2.data.repository.DevicePolicyResources -import com.android.intentresolver.v2.domain.model.Profile +import com.android.intentresolver.v2.shared.model.Profile import javax.inject.Inject import com.android.intentresolver.R diff --git a/java/src/com/android/intentresolver/v2/ui/model/ResolverRequest.kt b/java/src/com/android/intentresolver/v2/ui/model/ResolverRequest.kt index 5abfb602..a4f74ca9 100644 --- a/java/src/com/android/intentresolver/v2/ui/model/ResolverRequest.kt +++ b/java/src/com/android/intentresolver/v2/ui/model/ResolverRequest.kt @@ -19,7 +19,7 @@ package com.android.intentresolver.v2.ui.model import android.content.Intent import android.content.pm.ResolveInfo import android.os.UserHandle -import com.android.intentresolver.v2.domain.model.Profile +import com.android.intentresolver.v2.shared.model.Profile import com.android.intentresolver.v2.ext.isHomeIntent /** All of the things that are consumed from an incoming Intent Resolution request (+Extras). */ diff --git a/java/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestReader.kt b/java/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestReader.kt index fc9f1e01..22d76493 100644 --- a/java/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestReader.kt +++ b/java/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestReader.kt @@ -20,7 +20,7 @@ import android.os.Bundle import android.os.UserHandle import com.android.intentresolver.v2.ResolverActivity.PROFILE_PERSONAL import com.android.intentresolver.v2.ResolverActivity.PROFILE_WORK -import com.android.intentresolver.v2.domain.model.Profile +import com.android.intentresolver.v2.shared.model.Profile import com.android.intentresolver.v2.ui.model.ActivityLaunch import com.android.intentresolver.v2.ui.model.ResolverRequest import com.android.intentresolver.v2.validation.Validation diff --git a/tests/unit/src/com/android/intentresolver/v2/domain/interactor/UserInteractorTest.kt b/tests/unit/src/com/android/intentresolver/v2/domain/interactor/UserInteractorTest.kt index b2c65867..b66fabfd 100644 --- a/tests/unit/src/com/android/intentresolver/v2/domain/interactor/UserInteractorTest.kt +++ b/tests/unit/src/com/android/intentresolver/v2/domain/interactor/UserInteractorTest.kt @@ -18,10 +18,10 @@ package com.android.intentresolver.v2.domain.interactor import com.android.intentresolver.v2.coroutines.collectLastValue import com.android.intentresolver.v2.data.repository.FakeUserRepository -import com.android.intentresolver.v2.domain.model.Profile -import com.android.intentresolver.v2.domain.model.Profile.Type.PERSONAL -import com.android.intentresolver.v2.domain.model.Profile.Type.PRIVATE -import com.android.intentresolver.v2.domain.model.Profile.Type.WORK +import com.android.intentresolver.v2.shared.model.Profile +import com.android.intentresolver.v2.shared.model.Profile.Type.PERSONAL +import com.android.intentresolver.v2.shared.model.Profile.Type.PRIVATE +import com.android.intentresolver.v2.shared.model.Profile.Type.WORK import com.android.intentresolver.v2.shared.model.User import com.android.intentresolver.v2.shared.model.User.Role import com.google.common.truth.Truth.assertThat diff --git a/tests/unit/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestTest.kt b/tests/unit/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestTest.kt index a5acb0d3..e88c46f5 100644 --- a/tests/unit/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestTest.kt +++ b/tests/unit/src/com/android/intentresolver/v2/ui/viewmodel/ResolverRequestTest.kt @@ -22,7 +22,7 @@ import android.os.UserHandle import androidx.core.net.toUri import androidx.core.os.bundleOf import com.android.intentresolver.v2.ResolverActivity.PROFILE_WORK -import com.android.intentresolver.v2.domain.model.Profile.Type.WORK +import com.android.intentresolver.v2.shared.model.Profile.Type.WORK import com.android.intentresolver.v2.ui.model.ActivityLaunch import com.android.intentresolver.v2.ui.model.ResolverRequest import com.android.intentresolver.v2.validation.UncaughtException |