From 0b00bfbb9fbe1ad9f7972a576e670d9087880545 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Fri, 13 Jan 2023 13:42:33 +0700
Subject: [PATCH] Revert "Cherish:add edge light customizations[2/2]"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit c54c2eb6c2a11db69fe17e6448c06094ef3c2498.

Revert "Cherish:update edge light preferences"

This reverts commit b88457ea22bf6162163fd28c72f8adfc4622729f.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_arrays.xml                 | 15 ---
 res/values/cherish_strings.xml                | 16 ----
 res/xml/cherish_settings_edge_light.xml       | 52 -----------
 res/xml/cherish_settings_lockscreen.xml       |  6 --
 ...dgeLightColorPickerPreferenceController.kt | 92 -------------------
 .../settings/lockscreen/EdgeLightSettings.kt  | 87 ------------------
 6 files changed, 268 deletions(-)
 delete mode 100644 res/xml/cherish_settings_edge_light.xml
 delete mode 100644 src/com/cherish/settings/lockscreen/EdgeLightColorPickerPreferenceController.kt
 delete mode 100644 src/com/cherish/settings/lockscreen/EdgeLightSettings.kt

diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index 8a56813..b4fb303 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -498,21 +498,6 @@
         <item>1800000</item>
     </string-array>
 	
-	<!-- Edge light color modes -->
-    <string-array name="edge_light_color_mode_entries" translatable="false">
-        <item>@string/accent_color</item>
-        <item>@string/notification_color</item>
-        <item>@string/wallpaper_color</item>
-        <item>@string/custom_color</item>
-    </string-array>
-
-    <string-array name="edge_light_color_mode_values">
-        <item>0</item>
-        <item>1</item>
-        <item>2</item>
-        <item>3</item>
-    </string-array>
-	
 	<!-- Smart Pixels -->
     <string-array name="smart_pixels_percent_strings" translatable="false">
         <item>12</item>
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index fa7b276..1a60931 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -681,22 +681,6 @@
     <string name="reticker_summary">Replace heads-up notification with slim and less invasive version of redesigned ticker</string>
     <string name="reticker_colored_title">Use app colored background</string>
     <string name="reticker_colored_summary">Replace reTicker background color using notification app main color</string>
-	
-	<!-- Edge light -->
-    <string name="edge_light_title">Edge light</string>
-    <string name="enable_edge_light">Enable Edge Light</string>
-    <string name="edge_light_intro_text">Display an animation along the edges of the screen when pulsing</string>
-    <string name="edge_light_always_trigger_on_pulse_title">Always trigger on pulse</string>
-    <string name="edge_light_always_trigger_on_pulse_summary">Whether to show edge light whenever ambient display is shown and not just for notifications</string>
-    <string name="edge_light_repeat_animation_title">Repeat animation</string>
-    <string name="edge_light_repeat_animation_summary_on">Repeat until timeout</string>
-    <string name="edge_light_repeat_animation_summary_off">Show only once</string>
-    <string name="edge_light_color_mode_title">Edge light color mode</string>
-    <string name="accent_color">Accent color (Default)</string>
-    <string name="notification_color">Notification color</string>
-    <string name="wallpaper_color">Wallpaper color</string>
-    <string name="custom_color">Custom color</string>
-    <string name="edge_light_custom_color_title">Custom color</string>
 
 	<!-- Power menu and dialogs opacity -->
     <string name="power_menu_transparency">Power/reboot menu opacity</string>
diff --git a/res/xml/cherish_settings_edge_light.xml b/res/xml/cherish_settings_edge_light.xml
deleted file mode 100644
index ffd3a1c..0000000
--- a/res/xml/cherish_settings_edge_light.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2022 FlamingoOS 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.
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/edge_light_title">
-
-    <com.android.settingslib.widget.TopIntroPreference
-        android:key="edge_light_intro"
-        android:title="@string/edge_light_intro_text" />
-
-    <com.cherish.settings.preferences.SystemSettingMainSwitchPreference
-        android:key="edge_light_enabled"
-        android:title="@string/enable_edge_light"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="edge_light_always_trigger_on_pulse"
-        android:title="@string/edge_light_always_trigger_on_pulse_title"
-        android:summary="@string/edge_light_always_trigger_on_pulse_summary"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="edge_light_repeat_animation"
-        android:title="@string/edge_light_repeat_animation_title"
-        android:summaryOn="@string/edge_light_repeat_animation_summary_on"
-        android:summaryOff="@string/edge_light_repeat_animation_summary_off"
-        android:defaultValue="false" />
-
-    <com.cherish.settings.preferences.SystemSettingListPreference
-        android:key="edge_light_color_mode"
-        android:title="@string/edge_light_color_mode_title"
-        android:entries="@array/edge_light_color_mode_entries"
-        android:entryValues="@array/edge_light_color_mode_values"
-        android:summary="%s"
-        android:defaultValue="0" />
-
-    <com.cherish.settings.preferences.SystemSettingColorPickerPreference
-        android:key="edge_light_custom_color"
-        android:title="@string/edge_light_custom_color_title"
-        android:defaultValue="#FFFFFF" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/cherish_settings_lockscreen.xml b/res/xml/cherish_settings_lockscreen.xml
index 9173bda..3907698 100644
--- a/res/xml/cherish_settings_lockscreen.xml
+++ b/res/xml/cherish_settings_lockscreen.xml
@@ -33,12 +33,6 @@
         android:entries="@array/torch_power_button_gesture_entries"
         android:entryValues="@array/torch_power_button_gesture_values" />
 
-	<Preference
-        android:key="edge_light_enabled"
-        android:title="@string/edge_light_title"
-        android:summary="@string/edge_light_intro_text"
-        android:fragment="com.cherish.settings.lockscreen.EdgeLightSettings"/>
-			
 	<com.cherish.settings.preferences.SecureSettingSwitchPreference
             android:key="power_menu_hide_on_secure"
             android:title="@string/power_menu_hide_on_secure_title"
diff --git a/src/com/cherish/settings/lockscreen/EdgeLightColorPickerPreferenceController.kt b/src/com/cherish/settings/lockscreen/EdgeLightColorPickerPreferenceController.kt
deleted file mode 100644
index 923232b..0000000
--- a/src/com/cherish/settings/lockscreen/EdgeLightColorPickerPreferenceController.kt
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2022 FlamingoOS 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.
- */
-
-package com.cherish.settings.lockscreen
-
-import android.content.Context
-import android.database.ContentObserver
-import android.os.Handler
-import android.os.Looper
-import android.os.UserHandle
-import android.provider.Settings
-
-import androidx.lifecycle.Lifecycle.Event
-import androidx.lifecycle.LifecycleEventObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.preference.Preference
-import androidx.preference.PreferenceScreen
-
-import com.android.settings.core.BasePreferenceController
-import com.android.settingslib.core.lifecycle.Lifecycle
-
-class EdgeLightColorPickerPreferenceController(
-    context: Context,
-    preferenceKey: String,
-    lifecycle: Lifecycle?,
-) : BasePreferenceController(context, preferenceKey),
-    LifecycleEventObserver {
-
-    private val settingsObserver = object : ContentObserver(
-        Handler(Looper.getMainLooper())
-    ) {
-        override fun onChange(selfChange: Boolean) {
-            preference?.let {
-                updateState(it)
-            }
-        }
-    }
-
-    private var preference: Preference? = null
-
-    init {
-        lifecycle?.addObserver(this)
-    }
-
-    override fun onStateChanged(owner: LifecycleOwner, event: Event) {
-        if (event == Event.ON_START) {
-            mContext.contentResolver.registerContentObserver(
-                Settings.System.getUriFor(Settings.System.EDGE_LIGHT_COLOR_MODE),
-                false /* notifyDescendants */,
-                settingsObserver,
-            )
-        } else if (event == Event.ON_STOP) {
-            mContext.contentResolver.unregisterContentObserver(settingsObserver)
-        }
-    }
-
-    override fun getAvailabilityStatus(): Int {
-        val isCustomColorMode = Settings.System.getIntForUser(
-            mContext.contentResolver,
-            Settings.System.EDGE_LIGHT_COLOR_MODE,
-            0, UserHandle.USER_CURRENT
-        ) == 3
-        return if (isCustomColorMode) {
-            AVAILABLE
-        } else {
-            DISABLED_DEPENDENT_SETTING
-        }
-    }
-
-    override fun displayPreference(screen: PreferenceScreen) {
-        super.displayPreference(screen)
-        preference = screen.findPreference(preferenceKey)
-    }
-
-    override fun updateState(preference: Preference) {
-        super.updateState(preference)
-        preference.setEnabled(getAvailabilityStatus() == AVAILABLE)
-    }
-}
\ No newline at end of file
diff --git a/src/com/cherish/settings/lockscreen/EdgeLightSettings.kt b/src/com/cherish/settings/lockscreen/EdgeLightSettings.kt
deleted file mode 100644
index ca7f535..0000000
--- a/src/com/cherish/settings/lockscreen/EdgeLightSettings.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2022 FlamingoOS 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.
- */
-
-package com.cherish.settings.lockscreen
-
-import android.content.Context
-import android.os.Bundle
-import android.widget.Switch
-
-import androidx.preference.forEachIndexed
-
-import com.android.settings.R
-import com.android.settings.search.BaseSearchIndexProvider
-import com.android.settingslib.core.AbstractPreferenceController
-import com.android.settingslib.core.lifecycle.Lifecycle
-import com.android.settingslib.search.SearchIndexable
-import com.android.settingslib.widget.MainSwitchPreference
-import com.android.settingslib.widget.OnMainSwitchChangeListener
-import com.android.settingslib.widget.TopIntroPreference
-import com.cherish.settings.fragments.CherishDashboardFragment
-
-@SearchIndexable
-class EdgeLightSettings : CherishDashboardFragment(), OnMainSwitchChangeListener {
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        super.onCreatePreferences(savedInstanceState, rootKey)
-        findPreference<MainSwitchPreference>(MAIN_SWITCH_KEY)?.also {
-            updatePreferences(it.isChecked)
-            it.addOnSwitchChangeListener(this)
-        }
-    }
-
-    override protected fun getPreferenceScreenResId() = R.xml.cherish_settings_edge_light
-
-    override protected fun getLogTag() = TAG
-
-    override protected fun createPreferenceControllers(
-        context: Context
-    ): List<AbstractPreferenceController> = buildPreferenceControllers(context, settingsLifecycle)
-
-    override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
-        updatePreferences(isChecked)
-    }
-
-    private fun updatePreferences(isChecked: Boolean) {
-        preferenceScreen.forEachIndexed { _, preference ->
-            if (preference !is MainSwitchPreference &&
-                preference !is TopIntroPreference
-            ) preference.isVisible = isChecked
-        }
-    }
-
-    companion object {
-        private const val TAG = "EdgeLightSettingsFragment"
-
-        private const val MAIN_SWITCH_KEY = "edge_light_enabled"
-        private const val CUSTOM_COLOR_PREFERENCE_KEY = "edge_light_custom_color"
-
-        private fun buildPreferenceControllers(
-            context: Context,
-            lifecycle: Lifecycle?,
-        ): List<AbstractPreferenceController> = listOf(
-            EdgeLightColorPickerPreferenceController(context, CUSTOM_COLOR_PREFERENCE_KEY, lifecycle)
-        )
-
-        @JvmField
-        val SEARCH_INDEX_DATA_PROVIDER = object : BaseSearchIndexProvider(R.xml.cherish_settings_edge_light) {
-            override fun createPreferenceControllers(
-                context: Context
-            ): List<AbstractPreferenceController> = buildPreferenceControllers(
-                context, null /* lifecycle */)
-        }
-    }
-}
\ No newline at end of file