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

Commit aa0d23a9 authored by Guojing Yuan's avatar Guojing Yuan
Browse files

Update CDM dialogs with ContextSync strings 

Fix: 267646302

Test: manually tested the dialogs
Change-Id: Ie1c116a9c3ae69f32ed9090adf68f9e44991cc94
parent 59130bd0

packages/CompanionDeviceManager/res/layout/list_item_permission.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
              android:orientation="horizontal"

              android:paddingStart="32dp"

              android:paddingEnd="32dp"

              android:paddingBottom="14dp">

              android:paddingTop="12dp">



    <ImageView

        android:id="@+id/permission_icon"

packages/CompanionDeviceManager/res/values/strings.xml

+9 −6
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    <string name="app_label">Companion Device Manager</string>



    <!-- Title of the device association confirmation dialog. -->

    <string name="confirmation_title">Allow &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; to access your &lt;strong&gt;<xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g>&lt;/strong&gt;</string>

    <string name="confirmation_title">Allow &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; to access &lt;strong&gt;<xliff:g id="device_name" example="ASUS ZenWatch 2">%2$s</xliff:g>&lt;/strong&gt;</string>



    <!-- ================= DEVICE_PROFILE_WATCH and null profile ================= -->
@@ -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 interact with your notifications and access your Phone, SMS, Contacts, Calendar, Call logs and Nearby devices permissions.</string>

    <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>



    <!-- 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 interact with these permissions:</string>

    <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>



    <!-- TODO(b/256140614) To replace all glasses related strings with final versions -->

    <!-- ================= DEVICE_PROFILE_GLASSES ================= -->
@@ -43,10 +43,10 @@ 
    <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 interact with your notifications and access your Phone, SMS, Contacts, Microphone and Nearby devices permissions.</string>

    <string name="summary_glasses">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">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>

    <string name="summary_glasses_single_device">The 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 these permissions:</string>



    <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= -->
@@ -99,7 +99,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"></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>



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

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

+3 −5
Original line number Diff line number Diff line
@@ -546,17 +546,16 @@ public class CompanionDeviceActivity extends FragmentActivity implements 
        }



        if (deviceProfile == null) {

            // Summary is not needed for null profile.

            mSummary.setVisibility(View.GONE);

            summary = getHtmlFromResources(this, SUMMARIES.get(null), deviceName);

            mConstraintList.setVisibility(View.GONE);

        } else {

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

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

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

            setupPermissionList();

        }



        title = getHtmlFromResources(this, TITLES.get(deviceProfile), appLabel, deviceName);

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

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

        profileIcon = getIcon(this, PROFILE_ICON.get(deviceProfile));



        mTitle.setText(title);
@@ -586,7 +585,6 @@ public class CompanionDeviceActivity extends FragmentActivity implements 


        if (deviceProfile == null) {

            summary = getHtmlFromResources(this, summaryResourceId);

            mSummary.setVisibility(View.GONE);

        } else {

            summary = getHtmlFromResources(this, summaryResourceId, profileName, appLabel);

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ final class CompanionDeviceResources { 
        final Map<String, Integer> map = new ArrayMap<>();

        map.put(DEVICE_PROFILE_WATCH, R.string.summary_watch_single_device);

        map.put(DEVICE_PROFILE_GLASSES, R.string.summary_glasses_single_device);

        map.put(null, R.string.summary_generic);

        map.put(null, R.string.summary_generic_single_device);



        SUMMARIES = unmodifiableMap(map);

    }