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

Update the strings on app unavailable alert dialog

Browse Source 
- Update strings on Settings unavailable alert dialog to match
  UX guidelines.
- Update strings on other apps unavailable alert dialog to
  match UX guidelines.
- Add the test cases.

Bug: 227283466
Test: Manual, atest FrameworksServicesTests:VirtualDeviceManagerServiceTest
Change-Id: I9a527db49e3f6e6d3c147a18a3e4c8e403cda6bd
This commit is contained in:
Cliff Wu
2022-03-29 22:42:07 +08:00
parent 7038aedd7c
commit e230a7d8fd
5 changed files with 219 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
core/java/com/android/internal/app/BlockedAppStreamingActivity.java
View File

@@ -36,6 +36,7 @@ public class BlockedAppStreamingActivity extends AlertActivity {
private static final String EXTRA_BLOCKED_ACTIVITY_INFO =
PACKAGE_NAME + ".extra.BLOCKED_ACTIVITY_INFO";
private static final String EXTRA_STREAMED_DEVICE = PACKAGE_NAME + ".extra.STREAMED_DEVICE";
private static final String BLOCKED_COMPONENT_SETTINGS = "com.android.settings";
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -56,13 +57,24 @@ public class BlockedAppStreamingActivity extends AlertActivity {
CharSequence streamedDeviceName = intent.getCharSequenceExtra(EXTRA_STREAMED_DEVICE);
if (!TextUtils.isEmpty(streamedDeviceName)) {
mAlertParams.mTitle =
TextUtils.equals(activityInfo.packageName,
getPackageManager().getPermissionControllerPackageName())
? getString(R.string.app_streaming_blocked_title_for_permission_dialog)
: getString(R.string.app_streaming_blocked_title, appLabel);
mAlertParams.mMessage =
getString(R.string.app_streaming_blocked_message, streamedDeviceName);
if (TextUtils.equals(activityInfo.packageName,
getPackageManager().getPermissionControllerPackageName())) {
mAlertParams.mTitle =
getString(R.string.app_streaming_blocked_title_for_permission_dialog);
mAlertParams.mMessage =
getString(R.string.app_streaming_blocked_message_for_permission_dialog,
streamedDeviceName);
} else if (TextUtils.equals(activityInfo.packageName, BLOCKED_COMPONENT_SETTINGS)) {
mAlertParams.mTitle =
getString(R.string.app_streaming_blocked_title_for_settings_dialog);
mAlertParams.mMessage =
getString(R.string.app_streaming_blocked_message, streamedDeviceName);
} else {
mAlertParams.mTitle =
getString(R.string.app_streaming_blocked_title, appLabel);
mAlertParams.mMessage =
getString(R.string.app_streaming_blocked_message, streamedDeviceName);
}
} else {
mAlertParams.mTitle = getString(R.string.app_blocked_title);
mAlertParams.mMessage = getString(R.string.app_blocked_message, appLabel);