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

Commit bbd31263 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Change "app version lower" shortcut restore error message."

parents 4f7223d2 7eb8b955

core/res/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -4815,7 +4815,7 @@ 
    A toast message shown when an app shortcut that was restored from a previous device is clicked,

    but it cannot be started because the shortcut was created by a newer version of the app.

    -->

    <string name="shortcut_restored_on_lower_version">This shortcut requires latest app</string>

    <string name="shortcut_restored_on_lower_version">App version downgraded, or isn\u2019t compatible with this shortcut</string>



    <!--

    A toast message shown when an app shortcut that was restored from a previous device is clicked,

services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java

+2 −1
Original line number Diff line number Diff line
@@ -5149,7 +5149,8 @@ public class ShortcutManagerTest1 extends BaseShortcutManagerTest { 
                    .forAllShortcuts(si -> {

                        switch (package1DisabledReason) {

                            case ShortcutInfo.DISABLED_REASON_VERSION_LOWER:

                                assertEquals("This shortcut requires latest app",

                                assertEquals("App version downgraded, or isn’t compatible"

                                        + " with this shortcut",

                                        si.getDisabledMessage());

                                break;

                            case ShortcutInfo.DISABLED_REASON_SIGNATURE_MISMATCH: