From 43d7215f4d1e69cdb62632905b762681b51eacbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Tue, 4 May 2021 21:41:14 +0700
Subject: [PATCH] Revert "Cherish: Ambient Edge Pulse layout [2/2]"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b47fa93b0efea936572d1079dff5ddc6d5a89ab9.

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 deletions(-)

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index e30d411..6c8b580 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1413,16 +1413,4 @@
         <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 6a0f442..ca10247 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -897,9 +897,6 @@
     <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 5051cc8..75bdc03 100644
--- a/res/xml/cherish_settings_notifications.xml
+++ b/res/xml/cherish_settings_notifications.xml
@@ -172,13 +172,6 @@
             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.SystemSettingSwitchPreference
             android:key="ambient_light_pulse_for_all"
             android:title="@string/pulse_ambient_light_show_always_title"
diff --git a/src/com/cherish/settings/fragments/NotificationSettings.java b/src/com/cherish/settings/fragments/NotificationSettings.java
index cf2500e..315b0c3 100644
--- a/src/com/cherish/settings/fragments/NotificationSettings.java
+++ b/src/com/cherish/settings/fragments/NotificationSettings.java
@@ -25,7 +25,6 @@ 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;
@@ -44,7 +43,6 @@ public class NotificationSettings extends SettingsPreferenceFragment implements
     private CustomSeekBarPreference mEdgeLightDurationPreference;
     private CustomSeekBarPreference mEdgeLightRepeatCountPreference;
     private ListPreference mColorMode;
-    private SystemSettingListPreference mAmbientLightLayout;
     private SystemSettingSwitchPreference mAmbientPref;
     @Override
     public void onCreate(Bundle icicle) {
@@ -88,7 +86,6 @@ 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;
@@ -111,7 +108,6 @@ 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("#ff1a73e8")) {
             mEdgeLightColorPreference.setSummary(R.string.color_default);