diff --git a/packages/CompanionDeviceManager/res/drawable-night/ic_permission_microphone.xml b/packages/CompanionDeviceManager/res/drawable-night/ic_permission_microphone.xml new file mode 100644 index 0000000000000..161e4e6e6391c --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable-night/ic_permission_microphone.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/packages/CompanionDeviceManager/res/drawable/ic_permission_microphone.xml b/packages/CompanionDeviceManager/res/drawable/ic_permission_microphone.xml new file mode 100644 index 0000000000000..eca625d715a08 --- /dev/null +++ b/packages/CompanionDeviceManager/res/drawable/ic_permission_microphone.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/packages/CompanionDeviceManager/res/values/strings.xml b/packages/CompanionDeviceManager/res/values/strings.xml index ecc5f81e57f76..3b215415a460d 100644 --- a/packages/CompanionDeviceManager/res/values/strings.xml +++ b/packages/CompanionDeviceManager/res/values/strings.xml @@ -140,6 +140,9 @@ Calendar + + Microphone + Nearby devices @@ -169,6 +172,10 @@ + + + Can record audio using the microphone + diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java index c249f55224292..49a6334506294 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java @@ -36,6 +36,7 @@ import static com.android.companiondevicemanager.CompanionDeviceDiscoveryService import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_APP_STREAMING; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_CALENDAR; 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; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_NEARBY_DEVICE_STREAMING; import static com.android.companiondevicemanager.PermissionListAdapter.PERMISSION_NOTIFICATION; @@ -596,10 +597,9 @@ public class CompanionDeviceActivity extends FragmentActivity implements this, R.string.summary_glasses_single_device, profileName, appLabel); profileIcon = getIcon(this, R.drawable.ic_glasses); - // TODO (b/256140614): add PERMISSION_MICROPHONE mPermissionTypes.addAll(Arrays.asList( PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS, - PERMISSION_NEARBY_DEVICES)); + PERMISSION_MICROPHONE, PERMISSION_NEARBY_DEVICES)); setupPermissionList(); } else { diff --git a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java index 90b94fbd3de5d..00c44d6927822 100644 --- a/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java +++ b/packages/CompanionDeviceManager/src/com/android/companiondevicemanager/PermissionListAdapter.java @@ -51,6 +51,7 @@ class PermissionListAdapter extends RecyclerView.Adapter sTitleMap; static { @@ -64,6 +65,7 @@ class PermissionListAdapter extends RecyclerView.Adapter