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

Merge "Fix strings in PlatformCompatDashboard"

Browse Source 
am: a9f0446ce8

Change-Id: I56cb47ccfe8278e722556fb6f9d4d08f0ac35d52
This commit is contained in:
Andrei-Valentin Onea
2020-01-20 05:25:45 -08:00
committed by android-build-merger
parent c36a071238 a9f0446ce8
commit e89b34a366
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

@@ -10598,13 +10598,15 @@
<!-- Title for App Compatibility Changes dashboard where developers can configure per-app overrides for compatibility changes [CHAR LIMIT=50] --> <!-- 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> <string name="platform_compat_dashboard_title">App Compatibility Changes</string>
<!-- Summary for App Compatibility Changes dashboard [CHAR LIMIT=NONE] --> <!-- 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] --> <!-- Title for default enabled app compat changes category [CHAR LIMIT=50] -->
<string name="platform_compat_default_enabled_title">Default enabled changes</string> <string name="platform_compat_default_enabled_title">Default enabled changes</string>
<!-- Title for default disabled app compat changes category [CHAR LIMIT=50] --> <!-- Title for default disabled app compat changes category [CHAR LIMIT=50] -->
<string name="platform_compat_default_disabled_title">Default disabled changes</string> <string name="platform_compat_default_disabled_title">Default disabled changes</string>
<!-- Title for target SDK gated app compat changes category [CHAR LIMIT=50] --> <!-- Title for target SDK gated app compat changes category (do not translate 'targetSdkVersion') [CHAR LIMIT=50] -->
<string name="platform_compat_target_sdk_title">Enabled after SDK <xliff:g id="number" example="29">%d</xliff:g></string> <string name="platform_compat_target_sdk_title">Enabled for targetSdkVersion &gt; <xliff:g id="number" example="29">%d</xliff:g></string>
<!-- Slices Strings --> <!-- Slices Strings -->

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

@@ -228,9 +228,8 @@ public class PlatformCompatDashboard extends DashboardFragment {
final Drawable icon = applicationInfo.loadIcon(context.getPackageManager()); final Drawable icon = applicationInfo.loadIcon(context.getPackageManager());
final Preference appPreference = new Preference(context); final Preference appPreference = new Preference(context);
appPreference.setIcon(icon); appPreference.setIcon(icon);
appPreference.setSummary(mSelectedApp appPreference.setSummary(getString(R.string.platform_compat_selected_app_summary,
+ " SDK " mSelectedApp, applicationInfo.targetSdkVersion));
+ applicationInfo.targetSdkVersion);
appPreference.setKey(mSelectedApp); appPreference.setKey(mSelectedApp);
appPreference.setOnPreferenceClickListener( appPreference.setOnPreferenceClickListener(
preference -> { 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 = spy(new PlatformCompatDashboard());
mDashboard.mSelectedApp = APP_NAME; mDashboard.mSelectedApp = APP_NAME;
doReturn(mApplicationInfo).when(mDashboard).getApplicationInfo(); doReturn(mApplicationInfo).when(mDashboard).getApplicationInfo();
doReturn(mContext).when(mDashboard).getContext();
doReturn(mPlatformCompat).when(mDashboard).getPlatformCompat(); doReturn(mPlatformCompat).when(mDashboard).getPlatformCompat();
doReturn(mPreferenceScreen).when(mDashboard).getPreferenceScreen(); doReturn(mPreferenceScreen).when(mDashboard).getPreferenceScreen();
doReturn(mPreferenceManager).when(mDashboard).getPreferenceManager(); doReturn(mPreferenceManager).when(mDashboard).getPreferenceManager();
@@ -130,7 +131,8 @@ public class PlatformCompatDashboardTest {
Preference appPreference = mDashboard.createAppPreference(mApplicationInfo); 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 @Test