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

Commit e9e8c8bb authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Update CDM string for non-multi-device dialog" into udc-dev am: 7f10326f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22355842



Change-Id: I1198ce3e52013523a5776ccdcaaeb4dc521e85e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34e4ace4 7f10326f

packages/CompanionDeviceManager/res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ 
    <string name="chooser_title">Choose a <xliff:g id="profile_name" example="watch">%1$s</xliff:g> to be managed by &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%2$s</xliff:g>&lt;/strong&gt;</string>



    <!-- Description of the privileges the application will get if associated with the companion device of WATCH profile (type) [CHAR LIMIT=NONE] -->

    <string name="summary_watch">The app is needed to manage your <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>. <xliff:g id="app_name" example="Android Wear">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions.</string>

    <string name="summary_watch">This app is needed to manage your <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>. <xliff:g id="app_name" example="Android Wear">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions.</string>



    <!-- Description of the privileges the application will get if associated with the companion device of WATCH profile for singleDevice(type) [CHAR LIMIT=NONE] -->

    <string name="summary_watch_single_device">The app is needed to manage your <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>. <xliff:g id="app_name" example="Android Wear">%2$s</xliff:g> will be allowed to sync info, like the name of someone calling, and access these permissions:</string>

    <string name="summary_watch_single_device">This app will be allowed to sync info, like the name of someone calling, and access these permissions</string>



    <!-- ================= DEVICE_PROFILE_GLASSES ================= -->
@@ -48,7 +48,7 @@ 
    <string name="summary_glasses_multi_device">This app is needed to manage <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">This app will be allowed to access these permissions on your phone:</string>

    <string name="summary_glasses_single_device">This app will be allowed to access these permissions on your phone</string>



    <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= -->
@@ -97,10 +97,10 @@ 
    <string name="profile_name_generic">device</string>



    <!-- Description of the privileges the application will get if associated with the companion device of unspecified profile (type) [CHAR LIMIT=NONE] -->

    <string name="summary_generic_single_device">This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="device_name" example="My Watch">%1$s</xliff:g>.</string>

    <string name="summary_generic_single_device">This app will be able to sync info, like the name of someone calling, between your phone and <xliff:g id="device_name" example="My Watch">%1$s</xliff:g></string>



    <!-- Description of the privileges the application will get if associated with the companion device of unspecified profile (type) [CHAR LIMIT=NONE] -->

    <string name="summary_generic">This app will be able to sync info, like the name of someone calling, between your phone and the chosen device.</string>

    <string name="summary_generic">This app will be able to sync info, like the name of someone calling, between your phone and the chosen device</string>



    <!-- ================= Buttons ================= -->

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceActivity.java

+1 −2
Original line number Diff line number Diff line
@@ -551,8 +551,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements 
            summary = getHtmlFromResources(this, SUMMARIES.get(null), deviceName);

            mConstraintList.setVisibility(View.GONE);

        } else {

            summary = getHtmlFromResources(this, SUMMARIES.get(deviceProfile),

                    getString(PROFILES_NAME.get(deviceProfile)), appLabel);

            summary = getHtmlFromResources(this, SUMMARIES.get(deviceProfile));

            mPermissionTypes.addAll(PERMISSION_TYPES.get(deviceProfile));

            setupPermissionList();

        }