Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[CDM] Include "notifications" in the "glasses" CDM profile"

Browse Source
This commit is contained in:
Claudiu Ghioc
2022-12-19 14:24:26 +00:00
committed by Android (Google) Code Review
parent 9059d0ac00 872ffb60dd
commit 443fa6dccf
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/CompanionDeviceManager/res/values/strings.xml
View File

@@ -43,7 +43,7 @@
<string name="profile_name_glasses">glasses</string>
<!-- Description of the privileges the application will get if associated with the companion device of GLASSES profile (type) [CHAR LIMIT=NONE] -->
<string name="summary_glasses">This app is needed to manage your <xliff:g id="device_name" example="My Glasses">%1$s</xliff:g>. <xliff:g id="app_name" example="Glasses">%2$s</xliff:g> will be allowed to access your Phone, SMS, Contacts, Microphone and Nearby devices permissions.</string>
<string name="summary_glasses">This app is needed to manage your <xliff:g id="device_name" example="My Glasses">%1$s</xliff:g>. <xliff:g id="app_name" example="Glasses">%2$s</xliff:g> will be allowed to interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions.</string>
<!-- Description of the privileges the application will get if associated with the companion device of GLASSES profile for singleDevice(type) [CHAR LIMIT=NONE] -->
<string name="summary_glasses_single_device">The app is needed to manage your <xliff:g id="device_name" example="My Glasses">%1$s</xliff:g>. <xliff:g id="app_name" example="Glasses">%2$s</xliff:g> will be allowed to interact with these permissions:</string>

4
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java
View File

@@ -592,13 +592,13 @@ public class CompanionDeviceActivity extends FragmentActivity implements
setupPermissionList();
} else if (deviceProfile.equals(DEVICE_PROFILE_GLASSES)) {
profileName = getString(R.string.profile_name_glasses);
title = getHtmlFromResources(this, R.string.confirmation_title, appLabel, profileName);
title = getHtmlFromResources(this, R.string.confirmation_title, appLabel, deviceName);
summary = getHtmlFromResources(
this, R.string.summary_glasses_single_device, profileName, appLabel);
profileIcon = getIcon(this, R.drawable.ic_glasses);
mPermissionTypes.addAll(Arrays.asList(
PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS,
PERMISSION_NOTIFICATION, PERMISSION_PHONE, PERMISSION_SMS, PERMISSION_CONTACTS,
PERMISSION_MICROPHONE, PERMISSION_NEARBY_DEVICES));
setupPermissionList();