Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f1c4696 authored by Andrei-Valentin Onea's avatar Andrei-Valentin Onea Committed by Automerger Merge Worker
Browse files

Merge "Fix app compat dashboard from settings app" am: 4445b40a am:... 

Merge "Fix app compat dashboard from settings app" am: 4445b40a am: 770e30b1 am: 88799529 am: c3839f47

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

Change-Id: I5a18fa2db11f9a240aa1d781810fca7717a36da3
parents 5f5d754a c3839f47

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ public class PlatformCompatDashboard extends DashboardFragment { 
        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<>();