Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 443fa6dc authored by Claudiu Ghioc's avatar Claudiu Ghioc Committed by Android (Google) Code Review
Browse files

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

parents 9059d0ac 872ffb60
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>
+2 −2
Original line number Diff line number Diff line
@@ -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();