Settings: Make round QS toggleable [2/3]

Change-Id: Iaac5ff5f8dcef56b0993a55bf269a97370ea5c1d
diff --git a/res/values/leaf_arrays.xml b/res/values/leaf_arrays.xml
index 0a0615a..db338eb 100644
--- a/res/values/leaf_arrays.xml
+++ b/res/values/leaf_arrays.xml
@@ -51,6 +51,17 @@
         <item>2</item>
     </string-array>
 
+    <!-- QS panel style -->
+    <string-array name="qs_style_entries">
+        <item>@string/qs_style_default</item>
+        <item>@string/qs_style_round</item>
+    </string-array>
+
+    <string-array name="qs_style_values">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
     <!-- QS tile shape -->
     <string-array name="qs_tile_shape_entries">
         <item>@string/qs_tile_round</item>
diff --git a/res/values/leaf_strings.xml b/res/values/leaf_strings.xml
index 6e471f2..ab66e0f 100644
--- a/res/values/leaf_strings.xml
+++ b/res/values/leaf_strings.xml
@@ -67,6 +67,11 @@
     <string name="brightness_slider_style_filled">Filled</string>
     <string name="brightness_slider_style_thin">Thin</string>
 
+    <!-- QS style -->
+    <string name="qs_style_title">QS Panel style</string>
+    <string name="qs_style_default">Large pill</string>
+    <string name="qs_style_round">Small circle</string>
+
     <!-- Annoying Notifications -->
     <string name="notification_sound_vib_screen_on_title">Annoying Notifications</string>
     <string name="notification_sound_vib_screen_on_summary">Play sound and vibration for notifications when screen is on</string>
diff --git a/res/xml/qs_panel_settings.xml b/res/xml/qs_panel_settings.xml
index 7e3d769..a85f72f 100644
--- a/res/xml/qs_panel_settings.xml
+++ b/res/xml/qs_panel_settings.xml
@@ -55,6 +55,13 @@
         android:title="@string/category_name_qs_tiles">
 
         <com.android.settings.support.SecureSettingListPreference
+            android:key="qs_style_round"
+            android:title="@string/qs_style_title"
+            android:entries="@array/qs_style_entries"
+            android:entryValues="@array/qs_style_values"
+            android:defaultValue="1" />
+
+        <com.android.settings.support.SecureSettingListPreference
             android:key="qs_tile_shape"
             android:title="@string/qs_tile_shape"
             android:entries="@array/qs_tile_shape_entries"