diff options
| author | 2018-02-02 00:51:32 +0000 | |
|---|---|---|
| committer | 2018-02-02 00:51:32 +0000 | |
| commit | bbd31263b5c96de43296762ba8814a379b94755a (patch) | |
| tree | a366fe6e81f2be207dc24dc8270e78f5d44cbff7 | |
| parent | 4f7223d20bb4085334864f3405e27c6d4a18a42e (diff) | |
| parent | 7eb8b9558f81736966a77505ae57ea31fbcb1f30 (diff) | |
Merge "Change "app version lower" shortcut restore error message."
| -rw-r--r-- | core/res/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 224503bf6b3b..a24061621c3c 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -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, diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java index 56d4b7e8c1e8..857925b3ed17 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest1.java @@ -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: |