PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix strings in PlatformCompatDashboard" am: a9f0446ce8 am: e89b34a366 am: ad5fbe4177

Browse Source 
Change-Id: Ie9c5333086b607f14238235cfe5996254e09d767
This commit is contained in:
Automerger Merge Worker
2020-01-20 13:46:24 +00:00
parent e4cdbcba62 ad5fbe4177
commit 1b5b3fc3f3
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/values/strings.xml
View File

@@ -10805,13 +10805,15 @@
<!-- Title for App Compatibility Changes dashboard where developers can configure per-app overrides for compatibility changes [CHAR LIMIT=50] -->
<string name="platform_compat_dashboard_title">App Compatibility Changes</string>
<!-- Summary for App Compatibility Changes dashboard [CHAR LIMIT=NONE] -->
<string name="platform_compat_dashboard_summary">Modify app compatibility change overrides</string>
<string name="platform_compat_dashboard_summary">Toggle app compatibility changes</string>
<!-- Summary for selected app [DO NOT TRANSLATE] -->
<string name="platform_compat_selected_app_summary" translatable="false"><xliff:g id="app_name" example="com.google.android.chrome">%1$s</xliff:g> targetSdkVersion <xliff:g id="number" example="29">%2$d</xliff:g></string>
<!-- Title for default enabled app compat changes category [CHAR LIMIT=50] -->
<string name="platform_compat_default_enabled_title">Default enabled changes</string>
<!-- Title for default disabled app compat changes category [CHAR LIMIT=50] -->
<string name="platform_compat_default_disabled_title">Default disabled changes</string>
<!-- Title for target SDK gated app compat changes category [CHAR LIMIT=50] -->
<string name="platform_compat_target_sdk_title">Enabled after SDK <xliff:g id="number" example="29">%d</xliff:g></string>
<!-- Title for target SDK gated app compat changes category (do not translate 'targetSdkVersion') [CHAR LIMIT=50] -->
<string name="platform_compat_target_sdk_title">Enabled for targetSdkVersion &gt; <xliff:g id="number" example="29">%d</xliff:g></string>
<!-- Slices Strings -->

5
src/com/android/settings/development/compat/PlatformCompatDashboard.java
View File

@@ -223,9 +223,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 -> {

4
tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
View File

@@ -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