summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-05-25 09:07:08 -0700
committerSunny Goyal <sunnygoyal@google.com>2017-05-25 09:08:49 -0700
commit477b8cc1b457b66a432f3a2fe062b76127860108 (patch)
tree1de357ee9eb608259724316e2324b979872b3604 /res/values
parent368ae772018c12349d7bf1b27d8817e7644b08c2 (diff)
downloadandroid_packages_apps_Trebuchet-477b8cc1b457b66a432f3a2fe062b76127860108.tar.gz
android_packages_apps_Trebuchet-477b8cc1b457b66a432f3a2fe062b76127860108.tar.bz2
android_packages_apps_Trebuchet-477b8cc1b457b66a432f3a2fe062b76127860108.zip
Fixing string not correctly marked as non-translatable
Bug: 38371442 Change-Id: I79a679d461e422dbb4e4832192ac40e6c2d509de
Diffstat (limited to 'res/values')
-rw-r--r--res/values/config.xml21
-rw-r--r--res/values/strings.xml9
2 files changed, 20 insertions, 10 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 8f2590abc..a467a5ccc 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -19,22 +19,23 @@
<!-- Values for icon shape overrides. These should correspond to entries defined
in icon_shape_override_paths_names -->
- <string-array name="icon_shape_override_paths_values">
+ <string-array translatable="false" name="icon_shape_override_paths_values">
<item></item>
- <item translatable="false">M50,0L100,0 100,100 0,100 0,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,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z</item>
+ <item>M50,0L100,0 100,100 0,100 0,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,50,0,0 1 100,50 L100,85 A15,15,0,0 1 85,100 L50,100 A50,50,0,0 1 50,0z</item>
</string-array>
- <string-array name="icon_shape_override_paths_names">
+ <string-array translatable="false" name="icon_shape_override_paths_names">
<!-- Option to not change the icon shape on home screen. [CHAR LIMIT=50] -->
<item>@string/icon_shape_system_default</item>
- <item translatable="false">Square</item>
- <item translatable="false">Squircle</item>
- <item translatable="false">Circle</item>
- <item translatable="false">Teardrop</item>
+ <item>@string/icon_shape_square</item>
+ <item>@string/icon_shape_squircle</item>
+ <item>@string/icon_shape_circle</item>
+ <item>@string/icon_shape_teardrop</item>
</string-array>
+
<!-- DragController -->
<item type="id" name="drag_event_parity" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3648e1516..24a7b881a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -188,6 +188,15 @@
<string name="icon_shape_override_label">Change icon shape</string>
<!-- Option to not change the icon shape on home screen and use the system default setting instead. [CHAR LIMIT=50] -->
<string name="icon_shape_system_default">Use system default</string>
+ <!-- Option to change the shape of the home screen icons to a square. [CHAR LIMIT=50] -->
+ <string name="icon_shape_square">Square</string>
+ <!-- Option to change the shape of the home screen icons to a squircle. This represents the name of the shape somewhere between a circle and a square. [CHAR LIMIT=50] -->
+ <string name="icon_shape_squircle">Squircle</string>
+ <!-- Option to change the shape of the home screen icons to a circle. [CHAR LIMIT=50] -->
+ <string name="icon_shape_circle">Circle</string>
+ <!-- Option to change the shape of the home screen icons to a teardrop. This represents the name of the shape similar to a circle with with the bottom right corner pushed out like a square [CHAR LIMIT=50] -->
+ <string name="icon_shape_teardrop">Teardrop</string>
+
<!-- Message shown in the progress dialog when the icon shape override is being applied [CHAR LIMIT=100]-->
<string name="icon_shape_override_progress">Applying icon shape changes</string>