Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-02 00:51:32 +00:00
committed by Android (Google) Code Review
parent 4f7223d20b 7eb8b9558f
commit bbd31263b5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/strings.xml
View File

@@ -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,

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

@@ -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: