From b47fa93b0efea936572d1079dff5ddc6d5a89ab9 Mon Sep 17 00:00:00 2001
From: AnkitGourav <Ankitgourav035@gmail.com>
Date: Sun, 21 Mar 2021 21:50:32 -0400
Subject: [PATCH] Cherish: Ambient Edge Pulse layout [2/2]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                        | 12 ++++++++++++
 res/values/cherish_strings.xml                       |  3 +++
 res/xml/cherish_settings_notifications.xml           |  7 +++++++
 .../settings/fragments/NotificationSettings.java     |  4 ++++
 4 files changed, 26 insertions(+)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index ab2ded5..0adee60 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1404,4 +1404,16 @@
         <item>2</item>
         <item>3</item>
     </string-array>
+
+	<!-- Edge light layout -->
+    <string-array name="pulse_ambient_light_layout_entries">
+        <item>@string/pulse_ambient_light_layout_solid</item>
+        <item>@string/pulse_ambient_light_layout_faded</item>
+    </string-array>
+
+    <string-array name="pulse_ambient_light_layout_values" translatable="false">
+        <item>0</item>
+        <item>1</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index f996cfa..54e3b3a 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -910,6 +910,9 @@
     <string name="pulse_ambient_light_duration_summary">Sets the ambient light animation duration</string>
     <string name="pulse_ambient_light_repeat_count_title">Edge Light Repeat count</string>
     <string name="pulse_ambient_light_repeat_count_summary">Set max repeat count. 0 for infinite</string>
+    <string name="pulse_ambient_light_layout_title">Edge Light View</string>
+    <string name="pulse_ambient_light_layout_solid">Solid</string>
+    <string name="pulse_ambient_light_layout_faded">Faded</string>
 
     <!-- Power menu on lockscreen -->
     <string name="lockscreen_power_menu_disabled_title">Disable power menu on lock screen</string>
diff --git a/res/xml/cherish_settings_notifications.xml b/res/xml/cherish_settings_notifications.xml
index 509b25b..ab84b6d 100644
--- a/res/xml/cherish_settings_notifications.xml
+++ b/res/xml/cherish_settings_notifications.xml
@@ -162,6 +162,13 @@
             android:defaultValue="false"
             android:dependency="ambient_notification_light_enabled"/>
 
+        <com.cherish.settings.preferences.SystemSettingListPreference
+            android:key="pulse_ambient_light_layout"
+            android:title="@string/pulse_ambient_light_layout_title"
+            android:entries="@array/pulse_ambient_light_layout_entries"
+            android:entryValues="@array/pulse_ambient_light_layout_values"
+            android:defaultValue="0" />
+
         <com.cherish.settings.preferences.SystemSettingListPreference
             android:key="ambient_notification_light_timeout"
             android:dialogTitle="@string/ambient_notification_light_timeout_title"
diff --git a/src/com/cherish/settings/fragments/NotificationSettings.java b/src/com/cherish/settings/fragments/NotificationSettings.java
index e4ca91d..b05efc6 100644
--- a/src/com/cherish/settings/fragments/NotificationSettings.java
+++ b/src/com/cherish/settings/fragments/NotificationSettings.java
@@ -18,6 +18,7 @@ import com.cherish.settings.preferences.SystemSettingMasterSwitchPreference;
 import com.cherish.settings.preferences.SystemSettingSeekBarPreference;
 import com.cherish.settings.preferences.CustomSeekBarPreference;
 import com.cherish.settings.preferences.SystemSettingListPreference;
+import com.cherish.settings.preferences.SystemSettingListPreference;
 import com.cherish.settings.preferences.SystemSettingSwitchPreference;
 import net.margaritov.preference.colorpicker.ColorPickerPreference;
 import com.android.internal.util.cherish.CherishUtils;
@@ -35,6 +36,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
     private SystemSettingSeekBarPreference mEdgeLightDurationPreference;
     private SystemSettingSeekBarPreference mEdgeLightRepeatCountPreference;
     private ListPreference mColorMode;
+    private SystemSettingListPreference mAmbientLightLayout;
 	
     @Override
     public void onCreate(Bundle icicle) {
@@ -69,6 +71,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
         mEdgeLightDurationPreference.setValue(duration);
 
         mColorMode = (ListPreference) findPreference(PULSE_COLOR_MODE_PREF);
+        mAmbientLightLayout = (SystemSettingListPreference) findPreference("pulse_ambient_light_layout");
         int value;
         boolean colorModeAutomatic = Settings.System.getInt(getContentResolver(),
                 Settings.System.NOTIFICATION_PULSE_COLOR_AUTOMATIC, 0) != 0;
@@ -91,6 +94,7 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
                 Settings.System.NOTIFICATION_PULSE_COLOR, 0xFF3980FF);
         mEdgeLightColorPreference.setNewPreviewColor(edgeLightColor);
         mEdgeLightColorPreference.setAlphaSliderEnabled(false);
+        mAmbientLightLayout.setEnabled(true);
         String edgeLightColorHex = String.format("#%08x", (0xFF3980FF & edgeLightColor));
         if (edgeLightColorHex.equals("#ff3980ff")) {
             mEdgeLightColorPreference.setSummary(R.string.color_default);