From 523c12ffac7fb3a79458e56f9439a070b8930d6a Mon Sep 17 00:00:00 2001
From: Joey Rizzoli <joey@lineageos.org>
Date: Sat, 2 Dec 2017 17:31:32 +0100
Subject: Trebuchet: initial icon shape exposure for future extension

Change-Id: I76a571ce2b53214ef197a5164f584cb4dc2d3ecf
Signed-off-by: Joey Rizzoli <joey@lineageos.org>
---
 res/values/lineage_adaptive_icons.xml | 50 +++++++++++++++++++++++++++++++++++
 res/values/lineage_strings.xml        |  7 +++--
 res/xml/launcher_preferences.xml      |  6 ++---
 3 files changed, 58 insertions(+), 5 deletions(-)
 create mode 100644 res/values/lineage_adaptive_icons.xml

(limited to 'res')

diff --git a/res/values/lineage_adaptive_icons.xml b/res/values/lineage_adaptive_icons.xml
new file mode 100644
index 000000000..544677eee
--- /dev/null
+++ b/res/values/lineage_adaptive_icons.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2017 The LineageOS Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+
+    <!-- Default icon pack package name. Override to set a default icon pack, use "Default" to use system icons -->
+    <string name="icon_pack_default" translatable="false">Default</string>
+
+    <string name="icon_shape_default" translatable="false">@string/mask_path_circle</string>
+
+    <!-- Masks names -->
+    <string-array name="icon_shape_entries" translatable="false">
+        <item>@string/icon_shape_circle_name</item>
+        <item>@string/icon_shape_square_name</item>
+        <item>@string/icon_shape_squircle_name</item>
+        <item>@string/icon_shape_teardrop_name</item>
+    </string-array>
+
+    <!-- Mask paths references -->
+    <string-array name="icon_shape_paths" translatable="false">
+        <item>@string/mask_path_circle</item>
+        <item>@string/mask_path_square</item>
+        <item>@string/mask_path_squircle</item>
+        <item>@string/mask_path_teardrop</item>
+    </string-array>
+
+    <!-- Circle: default -->
+    <string name="mask_path_circle" translatable="false">"M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"</string>
+    <!-- Rounded square -->
+    <string name="mask_path_square" translatable="false">"M50,0L92,0C96.42,0 100,4.58 100 8L100,92C100, 96.42 96.42 100 92 100L8 100C4.58, 100 0 96.42 0 92L0 8 C 0 4.42 4.42 0 8 0L50 0Z"</string>
+    <!-- Straight square: disabled -->
+    <string name="mask_path_straight_square" translatable="false">"M50,0L100,0 100,100 0,100 0,0z"</string>
+    <!-- Squircle -->
+    <string name="mask_path_squircle" 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"</string>
+    <!-- Teardrop -->
+    <string name="mask_path_teardrop" 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"</string>
+</resources>
\ No newline at end of file
diff --git a/res/values/lineage_strings.xml b/res/values/lineage_strings.xml
index a03ccec17..afe0ad2df 100644
--- a/res/values/lineage_strings.xml
+++ b/res/values/lineage_strings.xml
@@ -51,8 +51,11 @@
     <string name="icon_pack_reset">Reset</string>
     <string name="icon_pack_system">System (Default)</string>
 
-    <!-- Default icon pack package name. Override to set a default icon pack, use "Default" to use system icons -->
-    <string name="icon_pack_default" translatable="false">Default</string>
+    <!-- Icon shapes -->
+    <string name="icon_shape_square_name">Square</string>
+    <string name="icon_shape_circle_name">Circle</string>
+    <string name="icon_shape_squircle_name">Squircle</string>
+    <string name="icon_shape_teardrop_name">Teardrop</string>
 
     <!-- Preferences -->
     <string name="settings_category_home">Home screen settings</string>
diff --git a/res/xml/launcher_preferences.xml b/res/xml/launcher_preferences.xml
index a130e3c07..f4d7831f1 100644
--- a/res/xml/launcher_preferences.xml
+++ b/res/xml/launcher_preferences.xml
@@ -72,9 +72,9 @@
         android:title="@string/settings_category_icons">
 
         <ListPreference
-            android:defaultValue=""
-            android:entries="@array/icon_shape_override_paths_names"
-            android:entryValues="@array/icon_shape_override_paths_values"
+            android:defaultValue="@string/icon_shape_default"
+            android:entries="@array/icon_shape_entries"
+            android:entryValues="@array/icon_shape_paths"
             android:icon="@drawable/ic_settings_shape"
             android:key="pref_override_icon_shape"
             android:persistent="false"
-- 
cgit v1.2.3