From e0d6985188ceb5dc60e5ac46d66e71fb4888bb24 Mon Sep 17 00:00:00 2001 From: Richard MacGregor Date: Thu, 5 Dec 2024 16:49:02 -0800 Subject: Profile group exclusive roles setting changes Show profile group exclusive roles in primary default app list section. Show all users for which profile group exclusive role is available in default app screen. LOW_COVERAGE_REASON=FLAG_NOT_ENABLED Relnote: N/A Flag: com.android.permission.flags.cross_user_role_enabled Bug: 378887269 Test: atest RoleManagerTest Test: atest RoleManagerMultiUserTest Change-Id: Id0596f089d8cdcf13941646c547871fce679de18 --- PermissionController/res/xml/roles.xml | 1 + ...TestingProfileGroupExclusivityRoleBehavior.java | 31 +++++++++ .../android/permissioncontroller/role/TEST_MAPPING | 6 ++ .../role/ui/DefaultAppChildFragment.java | 33 +++++++-- .../ui/DefaultAppConfirmationDialogFragment.java | 23 ++++--- .../role/ui/DefaultAppListViewModel.java | 33 +++++++-- .../role/ui/DefaultAppViewModel.java | 26 +++++-- .../role/ui/MergeRoleListLiveData.java | 77 +++++++++++++++++++++ .../role/ui/MergeRoleLiveData.java | 62 +++++++++++++++++ .../role/ui/RoleListFilterFunction.java | 53 +++++++++++++++ ...stingProfileGroupExclusivityRoleUiBehavior.java | 63 +++++++++++++++++ .../ui/specialappaccess/MergeRoleListLiveData.java | 79 ---------------------- .../ui/specialappaccess/MergeRoleLiveData.java | 64 ------------------ .../SpecialAppAccessListViewModel.java | 1 + .../SpecialAppAccessViewModel.java | 1 + .../role/ui/wear/WearDefaultAppHelper.kt | 29 ++++---- .../permissioncontroller/role/utils/UserUtils.java | 10 +++ 17 files changed, 412 insertions(+), 180 deletions(-) create mode 100644 PermissionController/src/com/android/permissioncontroller/role/ui/MergeRoleListLiveData.java create mode 100644 PermissionController/src/com/android/permissioncontroller/role/ui/MergeRoleLiveData.java create mode 100644 PermissionController/src/com/android/permissioncontroller/role/ui/RoleListFilterFunction.java create mode 100644 PermissionController/src/com/android/permissioncontroller/role/ui/behavior/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java delete mode 100644 PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/MergeRoleListLiveData.java delete mode 100644 PermissionController/src/com/android/permissioncontroller/role/ui/specialappaccess/MergeRoleLiveData.java (limited to 'PermissionController') diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index 3d858a9c5..0ccd1ce1a 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -1886,6 +1886,7 @@ requestTitle="@string/role_for_testing_profile_group_exclusivity_request_title" shortLabel="@string/role_for_testing_profile_group_exclusivity_short_label" showNone="true" + uiBehavior="ReservedForTestingProfileGroupExclusivityRoleUiBehavior" visible="true"/>