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

Update strings for glasses and nearby_device_streaming

Browse Source 
* update prompt strings for the two new CDM profiles with versions
  approved by UX

Bug: 261147998
Test: manually

Change-Id: Ic705986864164fec99f444a3d02a22cd3641fc23
Signed-off-by: Claudiu Ghioc <claudiughioc@google.com>
This commit is contained in:
Claudiu Ghioc
2023-03-03 14:06:25 +01:00
parent 8b0a18473b
commit afa6b79c20
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,17 +36,19 @@
<!-- 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>
<!-- TODO(b/256140614) To replace all glasses related strings with final versions -->
<!-- ================= DEVICE_PROFILE_GLASSES ================= -->
<!-- Title of the device association confirmation dialog for glasses. -->
<string name="confirmation_title_glasses">Allow &lt;strong&gt;<xliff:g id="app_name" example="Android Wear">%1$s</xliff:g>&lt;/strong&gt; to manage &lt;strong&gt;<xliff:g id="device_name" example="Glasses">%2$s</xliff:g>&lt;/strong&gt;?</string>
<!-- The name of the "glasses" device type [CHAR LIMIT=30] -->
<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 <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_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">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>
<string name="summary_glasses_single_device">This app will be allowed to access these permissions on your phone:</string>
<!-- ================= DEVICE_PROFILE_APP_STREAMING ================= -->
@@ -81,17 +83,13 @@
<!-- Description of the helper dialog for COMPUTER profile. [CHAR LIMIT=NONE] -->
<string name="helper_summary_computer"><xliff:g id="app_name" example="GMS">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_type" example="Chromebook">%2$s</xliff:g> to access your phone\u2019s photos, media, and notifications</string>
<!-- TODO(b/256140614) To replace all nearby_device_streaming related strings with final versions -->
<!-- ================= DEVICE_PROFILE_NEARBY_DEVICE_STREAMING ================= -->
<!-- Confirmation for associating an application with a companion device of NEARBY_DEVICE_STREAMING profile (type) [CHAR LIMIT=NONE] -->
<string name="title_nearby_device_streaming">Allow &lt;strong&gt;<xliff:g id="app_name" example="NearbyStreamer">%1$s</xliff:g>&lt;/strong&gt; to perform this action from your phone</string>
<!-- Title of the helper dialog for NEARBY_DEVICE_STREAMING profile [CHAR LIMIT=30]. -->
<string name="helper_title_nearby_device_streaming">Cross-device services</string>
<string name="title_nearby_device_streaming">Allow &lt;strong&gt;<xliff:g id="device_name" example="NearbyStreamer">%1$s</xliff:g>&lt;/strong&gt; to take this action?</string>
<!-- Description of the helper dialog for NEARBY_DEVICE_STREAMING profile. [CHAR LIMIT=NONE] -->
<string name="helper_summary_nearby_device_streaming"><xliff:g id="app_name" example="NearbyStreamerApp">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_type" example="NearbyDevice">%2$s</xliff:g> to stream content to nearby devices</string>
<string name="helper_summary_nearby_device_streaming"><xliff:g id="app_name" example="NearbyStreamerApp">%1$s</xliff:g> is requesting permission on behalf of your <xliff:g id="device_name" example="NearbyDevice">%2$s</xliff:g> to stream apps and other system features to nearby devices</string>
<!-- ================= null profile ================= -->
@@ -161,7 +159,7 @@
<string name="permission_app_streaming">Apps</string>
<!-- Nearby_device_streaming permission will be granted to the corresponding profile [CHAR LIMIT=45] -->
<string name="permission_nearby_device_streaming">Nearby Device Streaming</string>
<string name="permission_nearby_device_streaming">Streaming</string>
<!-- Description of phone permission of corresponding profile [CHAR LIMIT=NONE] -->
<string name="permission_phone_summary">Can make and manage phone calls</string>
@@ -179,8 +177,7 @@
<string name="permission_calendar_summary">Can access your calendar</string>
<!-- Description of microphone permission of corresponding profile [CHAR LIMIT=NONE] -->
<!-- TODO(b/256140614) Need the description for microphone permission -->
<string name="permission_microphone_summary">Can record audio using the microphone</string>
<string name="permission_microphone_summary">Can record audio</string>
<!-- Description of nearby devices' permission of corresponding profile [CHAR LIMIT=NONE] -->
<string name="permission_nearby_devices_summary">Can find, connect to, and determine the relative position of nearby devices</string>
@@ -195,7 +192,6 @@
<string name="permission_storage_summary"></string>
<!-- Description of nearby_device_streaming permission of corresponding profile [CHAR LIMIT=NONE] -->
<!-- TODO(b/256140614) Need the description for nearby devices' permission -->
<string name="permission_nearby_device_streaming_summary">Stream content to a nearby device</string>
<string name="permission_nearby_device_streaming_summary">Stream apps and other system features from your phone</string>
</resources>

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

@@ -30,6 +30,7 @@ import static com.android.companiondevicemanager.CompanionDeviceDiscoveryService
import static com.android.companiondevicemanager.CompanionDeviceResources.MULTI_DEVICES_SUMMARIES;
import static com.android.companiondevicemanager.CompanionDeviceResources.PERMISSION_TYPES;
import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILES_NAME;
import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILES_NAME_MULTI;
import static com.android.companiondevicemanager.CompanionDeviceResources.PROFILE_ICON;
import static com.android.companiondevicemanager.CompanionDeviceResources.SUMMARIES;
import static com.android.companiondevicemanager.CompanionDeviceResources.SUPPORTED_PROFILES;
@@ -571,6 +572,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements
final String deviceProfile = mRequest.getDeviceProfile();
final String profileName;
final String profileNameMulti;
final Spanned summary;
final Drawable profileIcon;
final int summaryResourceId;
@@ -580,6 +582,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements
}
profileName = getString(PROFILES_NAME.get(deviceProfile));
profileNameMulti = getString(PROFILES_NAME_MULTI.get(deviceProfile));
profileIcon = getIcon(this, PROFILE_ICON.get(deviceProfile));
summaryResourceId = MULTI_DEVICES_SUMMARIES.get(deviceProfile);
@@ -590,7 +593,7 @@ public class CompanionDeviceActivity extends FragmentActivity implements
}
final Spanned title = getHtmlFromResources(
this, R.string.chooser_title, profileName, appLabel);
this, R.string.chooser_title, profileNameMulti, appLabel);
mTitle.setText(title);
mSummary.setText(summary);

17
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceResources.java
View File

@@ -59,7 +59,7 @@ final class CompanionDeviceResources {
map.put(DEVICE_PROFILE_COMPUTER, R.string.title_computer);
map.put(DEVICE_PROFILE_NEARBY_DEVICE_STREAMING, R.string.title_nearby_device_streaming);
map.put(DEVICE_PROFILE_WATCH, R.string.confirmation_title);
map.put(DEVICE_PROFILE_GLASSES, R.string.confirmation_title);
map.put(DEVICE_PROFILE_GLASSES, R.string.confirmation_title_glasses);
map.put(null, R.string.confirmation_title);
TITLES = unmodifiableMap(map);
@@ -97,7 +97,7 @@ final class CompanionDeviceResources {
static {
final Map<String, Integer> map = new ArrayMap<>();
map.put(DEVICE_PROFILE_WATCH, R.string.summary_watch);
map.put(DEVICE_PROFILE_GLASSES, R.string.summary_glasses);
map.put(DEVICE_PROFILE_GLASSES, R.string.summary_glasses_multi_device);
map.put(null, R.string.summary_generic);
MULTI_DEVICES_SUMMARIES = unmodifiableMap(map);
@@ -113,6 +113,16 @@ final class CompanionDeviceResources {
PROFILES_NAME = unmodifiableMap(map);
}
static final Map<String, Integer> PROFILES_NAME_MULTI;
static {
final Map<String, Integer> map = new ArrayMap<>();
map.put(DEVICE_PROFILE_GLASSES, R.string.profile_name_generic);
map.put(DEVICE_PROFILE_WATCH, R.string.profile_name_watch);
map.put(null, R.string.profile_name_generic);
PROFILES_NAME_MULTI = unmodifiableMap(map);
}
static final Map<String, Integer> PROFILE_ICON;
static {
final Map<String, Integer> map = new ArrayMap<>();
@@ -133,7 +143,6 @@ final class CompanionDeviceResources {
SUPPORTED_PROFILES = unmodifiableSet(set);
}
static final Set<String> SUPPORTED_SELF_MANAGED_PROFILES;
static {
final Set<String> set = new ArraySet<>();
@@ -145,6 +154,4 @@ final class CompanionDeviceResources {
SUPPORTED_SELF_MANAGED_PROFILES = unmodifiableSet(set);
}
}

8
packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionVendorHelperDialogFragment.java
View File

@@ -21,6 +21,7 @@ import static android.companion.AssociationRequest.DEVICE_PROFILE_COMPUTER;
import static android.companion.AssociationRequest.DEVICE_PROFILE_NEARBY_DEVICE_STREAMING;
import static com.android.companiondevicemanager.Utils.getApplicationIcon;
import static com.android.companiondevicemanager.Utils.getApplicationLabel;
import static com.android.companiondevicemanager.Utils.getHtmlFromResources;
import android.annotation.Nullable;
@@ -105,9 +106,11 @@ public class CompanionVendorHelperDialogFragment extends DialogFragment {
final String packageName = request.getPackageName();
final CharSequence displayName = request.getDisplayName();
final int userId = request.getUserId();
final CharSequence appLabel;
try {
applicationIcon = getApplicationIcon(getContext(), packageName);
appLabel = getApplicationLabel(getContext(), packageName, userId);
} catch (PackageManager.NameNotFoundException e) {
Log.e(TAG, "Package u" + userId + "/" + packageName + " not found.");
mListener.onShowHelperDialogFailed();
@@ -119,7 +122,7 @@ public class CompanionVendorHelperDialogFragment extends DialogFragment {
mAppIcon = view.findViewById(R.id.app_icon);
mButton = view.findViewById(R.id.btn_back);
final Spanned title;
final CharSequence title;
final Spanned summary;
switch (deviceProfile) {
@@ -136,8 +139,7 @@ public class CompanionVendorHelperDialogFragment extends DialogFragment {
break;
case DEVICE_PROFILE_NEARBY_DEVICE_STREAMING:
title = getHtmlFromResources(getContext(),
R.string.helper_title_nearby_device_streaming);
title = appLabel;
summary = getHtmlFromResources(
getContext(), R.string.helper_summary_nearby_device_streaming, title,
displayName);