diff --git a/packages/CompanionDeviceManager/res/drawable-night/ic_permission_call_logs.xml b/packages/CompanionDeviceManager/res/drawable-night/ic_permission_call_logs.xml new file mode 100644 index 0000000000000..4db291a3d321f --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable-night/ic_permission_call_logs.xml @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/drawable/ic_permission_call_logs.xml b/packages/CompanionDeviceManager/res/drawable/ic_permission_call_logs.xml new file mode 100644 index 0000000000000..817d3a0863a2f --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_permission_call_logs.xml @@ -0,0 +1,28 @@ + + + + + + + \ No newline at end of file diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index 0764d9032c1b8..c410d648e7eeb 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -143,7 +143,10 @@ Microphone - + + Call logs + + Nearby devices @@ -159,26 +162,26 @@ Nearby Device Streaming - Can access your phone number and network info. Required for making calls and VoIP, voicemail, call redirect, and editing call logs + Can make and manage phone calls + + + Can read and write phone call log - - + Can send and view SMS messages - Can read, create, or edit our contact list, as well as access the list of all accounts used on your device + Can access your contacts - - + Can access your calendar Can record audio using the microphone - - + Can find, connect to, and determine the relative position of nearby devices Can read all notifications, including information like contacts, messages, and photos diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java index 813c0c8199132..6f5f4fe91c992 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java @@ -25,6 +25,7 @@ import static android.companion.AssociationRequest.DEVICE_PROFILE_WATCH; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_APP_STREAMING; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_CALENDAR; +import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_CALL_LOGS; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_CONTACTS; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_MICROPHONE; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_NEARBY_DEVICES; @@ -73,7 +74,7 @@ final class CompanionDeviceResources { map.put(DEVICE_PROFILE_NEARBY_DEVICE_STREAMING, Arrays.asList(PERMISSION_NEARBY_DEVICE_STREAMING)); map.put(DEVICE_PROFILE_WATCH, Arrays.asList(PERMISSION_NOTIFICATION, PERMISSION_PHONE, - PERMISSION_SMS, PERMISSION_CONTACTS, PERMISSION_CALENDAR, + PERMISSION_CALL_LOGS, PERMISSION_SMS, PERMISSION_CONTACTS, PERMISSION_CALENDAR, PERMISSION_NEARBY_DEVICES)); map.put(DEVICE_PROFILE_GLASSES, Arrays.asList(PERMISSION_NOTIFICATION, PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS, PERMISSION_MICROPHONE, @@ -103,7 +104,6 @@ final class CompanionDeviceResources { } static final Map PROFILES_NAME; - static { final Map map = new ArrayMap<>(); map.put(DEVICE_PROFILE_WATCH, R.string.profile_name_watch); diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java index 00c44d6927822..556a05c55f88f 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java @@ -52,6 +52,7 @@ class PermissionListAdapter extends RecyclerView.Adapter sTitleMap; static { @@ -66,6 +67,7 @@ class PermissionListAdapter extends RecyclerView.Adapter