diff --git a/res/values/strings.xml b/res/values/strings.xml index 92db0fbad7f..2bc43e9a70d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10598,13 +10598,15 @@ App Compatibility Changes - Modify app compatibility change overrides + Toggle app compatibility changes + + %1$s targetSdkVersion %2$d Default enabled changes Default disabled changes - - Enabled after SDK %d + + Enabled for targetSdkVersion > %d diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java index 53c6e9ff83a..2932f7b1da1 100644 --- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java +++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java @@ -228,9 +228,8 @@ public class PlatformCompatDashboard extends DashboardFragment { final Drawable icon = applicationInfo.loadIcon(context.getPackageManager()); final Preference appPreference = new Preference(context); appPreference.setIcon(icon); - appPreference.setSummary(mSelectedApp - + " SDK " - + applicationInfo.targetSdkVersion); + appPreference.setSummary(getString(R.string.platform_compat_selected_app_summary, + mSelectedApp, applicationInfo.targetSdkVersion)); appPreference.setKey(mSelectedApp); appPreference.setOnPreferenceClickListener( preference -> { diff --git a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java index d0cb97a8ac8..e558d6285ab 100644 --- a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java +++ b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java @@ -105,6 +105,7 @@ public class PlatformCompatDashboardTest { mDashboard = spy(new PlatformCompatDashboard()); mDashboard.mSelectedApp = APP_NAME; doReturn(mApplicationInfo).when(mDashboard).getApplicationInfo(); + doReturn(mContext).when(mDashboard).getContext(); doReturn(mPlatformCompat).when(mDashboard).getPlatformCompat(); doReturn(mPreferenceScreen).when(mDashboard).getPreferenceScreen(); doReturn(mPreferenceManager).when(mDashboard).getPreferenceManager(); @@ -130,7 +131,8 @@ public class PlatformCompatDashboardTest { Preference appPreference = mDashboard.createAppPreference(mApplicationInfo); - assertThat(appPreference.getSummary()).isEqualTo(APP_NAME + " SDK 1"); + assertThat(appPreference.getSummary()).isEqualTo(mContext.getResources().getString( + R.string.platform_compat_selected_app_summary, APP_NAME, 1)); } @Test