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

Commit 05492401 authored by Oli Thompson's avatar Oli Thompson Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect strings in MiniResolver" into udc-dev

parents 33b6a657 f1e5bcbd

core/java/com/android/internal/app/ResolverActivity.java

+5 −4
Original line number Diff line number Diff line
@@ -1725,16 +1725,17 @@ public class ResolverActivity extends Activity implements 


        if (inWorkProfile) {

            ((TextView) findViewById(R.id.open_cross_profile)).setText(

                    devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_WORK,

                            () -> getString(R.string.miniresolver_open_in_work, targetDisplayLabel),

                    devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_PERSONAL,

                            () -> getString(R.string.miniresolver_open_in_personal,

                                    targetDisplayLabel),

                            targetDisplayLabel));

            ((Button) findViewById(R.id.use_same_profile_browser)).setText(

                    devicePolicyResourcesManager.getString(MINIRESOLVER_USE_WORK_BROWSER,

                            () -> getString(R.string.miniresolver_use_work_browser)));

        } else {

            ((TextView) findViewById(R.id.open_cross_profile)).setText(

                    devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_PERSONAL,

                            () -> getString(R.string.miniresolver_open_in_personal,

                    devicePolicyResourcesManager.getString(MINIRESOLVER_OPEN_IN_WORK,

                            () -> getString(R.string.miniresolver_open_in_work,

                                    targetDisplayLabel),

                            targetDisplayLabel));

            ((Button) findViewById(R.id.use_same_profile_browser)).setText(