diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-08-27 16:47:13 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-08-27 16:47:13 -0700 |
commit | fafd4c276e1a1db8449d1feb46800351adbc3ad6 (patch) | |
tree | 4c89beb37b0a148446976f99abab73172c98ca92 /res | |
parent | bcd2874ab9d2b83172a2ea771dea7a285f72a068 (diff) | |
parent | ebfae6e266590d04702441ed630704c5eb4ccaaa (diff) | |
download | android_packages_apps_Trebuchet-fafd4c276e1a1db8449d1feb46800351adbc3ad6.tar.gz android_packages_apps_Trebuchet-fafd4c276e1a1db8449d1feb46800351adbc3ad6.tar.bz2 android_packages_apps_Trebuchet-fafd4c276e1a1db8449d1feb46800351adbc3ad6.zip |
resolved conflicts for merge of ebfae6e2 to ub-launcher3-master
Change-Id: I1e0d5f1140e910b68322c4f5061d0a3c383899f0
Diffstat (limited to 'res')
-rw-r--r-- | res/values/config.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 6a6784015..79ae517c3 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -73,6 +73,9 @@ filter the activities shown in the launcher. Can be empty. --> <string name="app_filter_class" translatable="false"></string> + <!-- View ID to use for QSB widget --> + <item type="id" name="qsb_widget" /> + <!-- Accessibility actions --> <item type="id" name="action_remove" /> <item type="id" name="action_uninstall" /> |