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

Merge "Fix app compat dashboard from settings app" am: 4445b40a65 am: 770e30b1f9 am: 8879952967

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1481502

Change-Id: Ie87c9ff8ae1e76bb667f7201e6314ec995d2e133
This commit is contained in:
Andrei-Valentin Onea
2020-11-02 16:06:44 +00:00
committed by Automerger Merge Worker
parent c7b05589f2 8879952967
commit c3839f4732
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -11334,7 +11334,7 @@
<!-- 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 (do not translate 'targetSdkVersion') [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 for targetSdkVersion &gt; <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>
<!-- Title for the dialog shown when no debuggable apps are available [CHAR LIMIT=30] --> <!-- Title for the dialog shown when no debuggable apps are available [CHAR LIMIT=30] -->
<string name="platform_compat_dialog_title_no_apps">No apps available</string> <string name="platform_compat_dialog_title_no_apps">No apps available</string>
<!-- Explanatory text shown when no debuggable apps are available [CHAR LIMIT=NONE] --> <!-- Explanatory text shown when no debuggable apps are available [CHAR LIMIT=NONE] -->

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

@@ -149,7 +149,7 @@ public class PlatformCompatDashboard extends DashboardFragment {
final List<CompatibilityChangeInfo> disabledChanges = new ArrayList<>(); final List<CompatibilityChangeInfo> disabledChanges = new ArrayList<>();
final Map<Integer, List<CompatibilityChangeInfo>> targetSdkChanges = new TreeMap<>(); final Map<Integer, List<CompatibilityChangeInfo>> targetSdkChanges = new TreeMap<>();
for (CompatibilityChangeInfo change : mChanges) { for (CompatibilityChangeInfo change : mChanges) {
if (change.getEnableSinceTargetSdk() != 0) { if (change.getEnableSinceTargetSdk() > 0) {
List<CompatibilityChangeInfo> sdkChanges; List<CompatibilityChangeInfo> sdkChanges;
if (!targetSdkChanges.containsKey(change.getEnableSinceTargetSdk())) { if (!targetSdkChanges.containsKey(change.getEnableSinceTargetSdk())) {
sdkChanges = new ArrayList<>(); sdkChanges = new ArrayList<>();