summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2018-10-15 14:01:04 -0700
committerVadim Tryshev <vadimt@google.com>2018-10-19 14:34:00 -0700
commitdc7d25d3e18971e1199075a4b7e58a5ddfdf4d59 (patch)
tree822632cadfe69744231277dba0ac393e6f1d9dba /res
parent3f007ce28612df18d13f4ef19adc2609750c20cc (diff)
downloadandroid_packages_apps_Trebuchet-dc7d25d3e18971e1199075a4b7e58a5ddfdf4d59.tar.gz
android_packages_apps_Trebuchet-dc7d25d3e18971e1199075a4b7e58a5ddfdf4d59.tar.bz2
android_packages_apps_Trebuchet-dc7d25d3e18971e1199075a4b7e58a5ddfdf4d59.zip
Adding SystemShortcut for RemoteAction
Bug: 117888000 Test: manual test with a prototype Change-Id: I10ed0a8c0237a85af5ac32a7fc68e1f9d2ffc5ba
Diffstat (limited to 'res')
-rw-r--r--res/values/config.xml1
-rw-r--r--res/values/strings.xml3
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>