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

Merge "Fix incorrect strings in MiniResolver" into udc-dev am: 0549240152

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

Change-Id: Ia27ee12a7533ffba8b31f04a8641a56b07ac16bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Oli Thompson
2023-04-27 15:21:13 +00:00
committed by Automerger Merge Worker
parent 942f223358 0549240152
commit 2d37d67d8f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -1725,16 +1725,17 @@ public class ResolverActivity extends Activity implements
if (inWorkProfile) { if (inWorkProfile) {
((TextView) findViewById(R.id.open_cross_profile)).setText( ((TextView) findViewById(R.id.open_cross_profile)).setText(
devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_WORK, devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_PERSONAL,
() -> getString(R.string.miniresolver_open_in_work, targetDisplayLabel), () -> getString(R.string.miniresolver_open_in_personal,
targetDisplayLabel),
targetDisplayLabel)); targetDisplayLabel));
((Button) findViewById(R.id.use_same_profile_browser)).setText( ((Button) findViewById(R.id.use_same_profile_browser)).setText(
devicePolicyResourcesManager.getString(MINIRESOLVER_USE_WORK_BROWSER, devicePolicyResourcesManager.getString(MINIRESOLVER_USE_WORK_BROWSER,
() -> getString(R.string.miniresolver_use_work_browser))); () -> getString(R.string.miniresolver_use_work_browser)));
} else { } else {
((TextView) findViewById(R.id.open_cross_profile)).setText( ((TextView) findViewById(R.id.open_cross_profile)).setText(
devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_PERSONAL, devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_WORK,
() -> getString(R.string.miniresolver_open_in_personal, () -> getString(R.string.miniresolver_open_in_work,
targetDisplayLabel), targetDisplayLabel),
targetDisplayLabel)); targetDisplayLabel));
((Button) findViewById(R.id.use_same_profile_browser)).setText( ((Button) findViewById(R.id.use_same_profile_browser)).setText(