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

Commit 36acf046 authored by Evan Chen's avatar Evan Chen
Browse files

Add device type at the end of summary for single device

Also add a question mark at the end of the headers
No Profile singleDevice: https://screenshot.googleplex.com/3fuhm9jbuFMWkvd
Watch Profile singleDevice: https://screenshot.googleplex.com/AywBG2HjX2GEPyZ
Glass Profile singleDevice: https://screenshot.googleplex.com/4eMCX4b5rwd4NBS

Bug: 267646302
Test: cts
Change-Id: I1f16a88536526e4820f6ae1ba79c5501558a01ff
parent 9cc0dd6e
Loading
Loading
Loading
Loading
+9 −3
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 &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 ================= -->

@@ -34,7 +34,7 @@
    <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">This app 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 on your <xliff:g id="device_name" example="phone">%1$s</xliff:g></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 <xliff:g id="device_name" example="phone">%1$s</xliff:g></string>

    <!-- ================= DEVICE_PROFILE_APP_STREAMING ================= -->

@@ -194,4 +194,10 @@
    <!-- Description of nearby_device_streaming permission of corresponding profile [CHAR LIMIT=NONE] -->
    <string name="permission_nearby_device_streaming_summary">Stream apps and other system features from your phone</string>

    <!-- The type of the device for phone [CHAR LIMIT=30] -->
    <string name="device_type" product="default">phone</string>

    <!-- The type of the device for tablet [CHAR LIMIT=30] -->
    <string name="device_type" product="tablet">tablet</string>

</resources>
+2 −1
Original line number Diff line number Diff line
@@ -551,7 +551,8 @@ public class CompanionDeviceActivity extends FragmentActivity implements
            summary = getHtmlFromResources(this, SUMMARIES.get(null), deviceName);
            mConstraintList.setVisibility(View.GONE);
        } else {
            summary = getHtmlFromResources(this, SUMMARIES.get(deviceProfile));
            summary = getHtmlFromResources(
                    this, SUMMARIES.get(deviceProfile), getString(R.string.device_type));
            mPermissionTypes.addAll(PERMISSION_TYPES.get(deviceProfile));
            setupPermissionList();
        }