summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-05-16 16:45:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-05-16 16:45:59 +0000
commit054090ae2a9b6f729e82256d54dea877dd0d7fe7 (patch)
treef7cf989e097376872bf724476f79980db3ee980c
parentdc19a07aba37799746f451f829a38e072c011b15 (diff)
parente7539e9be6e446fb97b12af0b3899d8b64197f3c (diff)
downloadandroid_packages_apps_Trebuchet-054090ae2a9b6f729e82256d54dea877dd0d7fe7.tar.gz
android_packages_apps_Trebuchet-054090ae2a9b6f729e82256d54dea877dd0d7fe7.tar.bz2
android_packages_apps_Trebuchet-054090ae2a9b6f729e82256d54dea877dd0d7fe7.zip
Updating the icon shape override options
am: e7539e9be6 Change-Id: I5fa0da129b8173db1537562bdca67e1508ee2861
-rw-r--r--res/values/config.xml8
-rw-r--r--res/values/strings.xml4
2 files changed, 5 insertions, 7 deletions
diff --git a/res/values/config.xml b/res/values/config.xml
index 71984d667..ace1d7e5f 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -22,20 +22,18 @@
<string-array 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,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>
+ <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>
</string-array>
<string-array name="icon_shape_override_paths_names">
<!-- Option to not change the icon shape on home screen. [CHAR LIMIT=50] -->
- <item>@string/icon_shape_no_override</item>
+ <item>@string/icon_shape_system_default</item>
<item translatable="false">Square</item>
- <item translatable="false">Rounded corner rect</item>
<item translatable="false">Squircle</item>
<item translatable="false">Circle</item>
- <item translatable="false">Cylinder</item>
+ <item translatable="false">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 4bee87d33..e840328a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -180,8 +180,8 @@
<!-- Developer setting to change the shape of icons on home screen. [CHAR LIMIT=50] -->
<string name="icon_shape_override_label">Change icon shape</string>
- <!-- Option to not change the icon shape on home screen. [CHAR LIMIT=50] -->
- <string name="icon_shape_no_override">Do not change</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>
<!-- 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>