summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-04-10 18:41:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-10 18:41:54 +0000
commit70197166206a3b075eb4e901ce2aab78d887bb34 (patch)
tree1fc638e6f03adb69ba2a9a96add88884d9bc1c8e
parent7178a4b4feddf9a56fd5f70cc18ade1e504bc3a8 (diff)
parent3b31df70ea2e9ea5f48468d5155cf90ec87d2842 (diff)
downloadandroid_packages_apps_Trebuchet-70197166206a3b075eb4e901ce2aab78d887bb34.tar.gz
android_packages_apps_Trebuchet-70197166206a3b075eb4e901ce2aab78d887bb34.tar.bz2
android_packages_apps_Trebuchet-70197166206a3b075eb4e901ce2aab78d887bb34.zip
Merge "Marking icon paths as non-translatable" into ub-launcher3-dorval
am: 3b31df70ea Change-Id: I1130bc6e1a55f92ded5e44fd2c571e8d47013099
-rw-r--r--res/values/config.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 8b69cb4a4..751954fde 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -17,11 +17,11 @@
in icon_shape_override_paths_names -->
<string-array name="icon_shape_override_paths_values">
<item></item>
- <item>M50,0L100,0 100,100 0,100 0,0z</item>
- <item>M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z</item>
- <item>M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z</item>
- <item>M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0</item>
- <item>M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z</item>
+ <item translatable="false">M50,0L100,0 100,100 0,100 0,0z</item>
+ <item translatable="false">M50,0L80,0 A20,20,0,0 1 100,20 L100,80 A20,20,0,0 1 80,100 L20,100 A20,20,0,0 1 0,80 L 0,20 A20,20,0,0 1 20,0z</item>
+ <item translatable="false">M50,0 C10,0 0,10 0,50 0,90 10,100 50,100 90,100 100,90 100,50 100,10 90,0 50,0 Z</item>
+ <item translatable="false">M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0</item>
+ <item translatable="false">M50,0A50,30 0,0,1 100,30V70A50,30 0,0,1 0,70V30A50,30 0,0,1 50,0z</item>
</string-array>
<string-array name="icon_shape_override_paths_names">