commit 9f1c46967e0ce42dcebe3ed3fad73888fa87bc9c
author Andrei-Valentin Onea <andreionea@google.com> Mon Nov 02 16:20:54 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Nov 02 16:20:54 2020 +0000
tree ab7c2280958e372699d0fbdf166bbc7b0e1909db
parent 5f5d754af28ab31cb9030927f921e874d0342b6f
parent c3839f473293406460a9d8e3a4adbd1f7611019d

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

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

Change-Id: I5a18fa2db11f9a240aa1d781810fca7717a36da3

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 56f2fc4..acc7f51 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11469,7 +11469,7 @@
     <!-- 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 (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] -->
     <string name="platform_compat_dialog_title_no_apps">No apps available</string>
     <!-- Explanatory text shown when no debuggable apps are available [CHAR LIMIT=NONE] -->

src/com/android/settings/development/compat/PlatformCompatDashboard.java

diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
index 1d51f66..c617e17 100644
--- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java
+++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
@@ -149,7 +149,7 @@
         final List<CompatibilityChangeInfo> disabledChanges = new ArrayList<>();
         final Map<Integer, List<CompatibilityChangeInfo>> targetSdkChanges = new TreeMap<>();
         for (CompatibilityChangeInfo change : mChanges) {
-            if (change.getEnableSinceTargetSdk() != 0) {
+            if (change.getEnableSinceTargetSdk() > 0) {
                 List<CompatibilityChangeInfo> sdkChanges;
                 if (!targetSdkChanges.containsKey(change.getEnableSinceTargetSdk())) {
                     sdkChanges = new ArrayList<>();