diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-19 21:43:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-19 21:43:39 +0000 |
| commit | 44347633efc9e4b9ab43e1cb032baa00c330e4ae (patch) | |
| tree | 5165be14f621dbf4639cd116adf01d7a6d8d032a /res | |
| parent | 3ed8626e8370eb9d1e6569b79350a1c0b5efe7a8 (diff) | |
| parent | dc7d25d3e18971e1199075a4b7e58a5ddfdf4d59 (diff) | |
| download | android_packages_apps_Trebuchet-44347633efc9e4b9ab43e1cb032baa00c330e4ae.tar.gz android_packages_apps_Trebuchet-44347633efc9e4b9ab43e1cb032baa00c330e4ae.tar.bz2 android_packages_apps_Trebuchet-44347633efc9e4b9ab43e1cb032baa00c330e4ae.zip | |
Merge "Adding SystemShortcut for RemoteAction" into ub-launcher3-master
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/config.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 0efaccf19..85c2e65c5 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -123,6 +123,7 @@ <item type="id" name="action_deep_shortcuts" /> <item type="id" name="action_shortcuts_and_notifications"/> <item type="id" name="action_dismiss_notification" /> + <item type="id" name="action_remote_action_shortcut" /> <!-- QSB IDs. DO not change --> <item type="id" name="search_container_workspace" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index eb6b28413..7e5784d0b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -347,4 +347,7 @@ <string name="work_mode_off_label">Notifications and apps are off</string> <string name="bottom_work_tab_user_education_close_button">Close</string> <string name="bottom_work_tab_user_education_closed">Closed</string> + + <!-- Failed action error message: e.g. Failed: Pause --> + <string name="remote_action_failed">Failed: <xliff:g id="what" example="Pause">%1$s</xliff:g></string> </resources> |