From 45c73083bda8d1764a5f4c55b9a0cbdd0f03298e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Wed, 16 Jun 2021 22:56:39 +0700
Subject: [PATCH] Revert "Cherish:Allow customizing footer text [2/2]"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit fe88dd2014ac9950fdc5996c477ca34f23f8b561.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                |  2 --
 res/xml/cherish_settings_quicksettings.xml    |  9 -------
 .../settings/fragments/QuickSettings.java     | 27 +------------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 75dd26d..3af2303 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -696,8 +696,6 @@
     <!-- QS Footer Text -->
     <string name="qs_footer_text_title">QS footer text</string>
     <string name="qs_footer_text_summary">Display text at bottom of QS panel</string>
-    <string name="qs_footer_text_string_title">Customize footer text</string>
-    <string name="qs_footer_text_string_summary">Set to empty for default #KeepTheLove</string> 
 
     <!-- QS Header data uasge -->
     <string name="qs_datausage_title">Data usage in QS Header</string>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 5326edc..8d2fbbd 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -54,15 +54,6 @@
         android:summary="@string/qs_footer_text_summary"
         android:defaultValue="false"/>
 
-    <!-- QS footer text string -->
-    <com.cherish.settings.preferences.SystemSettingEditTextPreference
-        android:key="footer_text_string"
-        android:icon="@drawable/ic_edit1"
-        android:title="@string/qs_footer_text_string_title"
-        android:summary="@string/qs_footer_text_string_summary"
-        android:dependency="omni_footer_text_show"
-        android:defaultValue="#KeeptheLove" />
-
     <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="qs_edit_toggle"
         android:icon="@drawable/ic_edit"
diff --git a/src/com/cherish/settings/fragments/QuickSettings.java b/src/com/cherish/settings/fragments/QuickSettings.java
index f4797ab..ae21629 100644
--- a/src/com/cherish/settings/fragments/QuickSettings.java
+++ b/src/com/cherish/settings/fragments/QuickSettings.java
@@ -32,10 +32,8 @@ import java.util.ArrayList;
 public class QuickSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
 
-   private static final String FOOTER_TEXT_STRING = "footer_text_string";
    private static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header";
 
-    private SystemSettingEditTextPreference mFooterString;
     private SystemSettingMasterSwitchPreference mCustomHeader;
 
     @Override
@@ -52,35 +50,12 @@ public class QuickSettings extends SettingsPreferenceFragment implements
                 Settings.System.STATUS_BAR_CUSTOM_HEADER, 0);
         mCustomHeader.setChecked(qsHeader != 0);
         mCustomHeader.setOnPreferenceChangeListener(this);
-
-        mFooterString = (SystemSettingEditTextPreference) findPreference(FOOTER_TEXT_STRING);
-        mFooterString.setOnPreferenceChangeListener(this);
-        String footerString = Settings.System.getString(getContentResolver(),
-                FOOTER_TEXT_STRING);
-        if (footerString != null && footerString != "")
-            mFooterString.setText(footerString);
-        else {
-            mFooterString.setText("#KeepTheLove");
-            Settings.System.putString(getActivity().getContentResolver(),
-                    Settings.System.FOOTER_TEXT_STRING, "#KeepTheLove");
-        }
 	}
 
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-         if (preference == mFooterString) {
-            String value = (String) newValue;
-            if (value != "" && value != null)
-                Settings.System.putString(getActivity().getContentResolver(),
-                        Settings.System.FOOTER_TEXT_STRING, value);
-            else {
-                mFooterString.setText("#KeepTheLove");
-                Settings.System.putString(getActivity().getContentResolver(),
-                        Settings.System.FOOTER_TEXT_STRING, "#KeepTheLove");
-            }
-            return true;
-            } else if (preference == mCustomHeader) {
+        if (preference == mCustomHeader) {
             boolean header = (Boolean) newValue;
             Settings.System.putInt(resolver,
                     Settings.System.STATUS_BAR_CUSTOM_HEADER, header ? 1 : 0);