From 202cdc1d6768365929bb2ebbd5985bf77060e39b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Tue, 29 Mar 2022 09:25:47 +0700
Subject: [PATCH] Revert some commits
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert "Cherish: Black theme [2/3]"

This reverts commit 41392e2a629d3c8752dacea91dad03d87ade553b.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>

Revert "Cherish: Bring back Monet settings"

This reverts commit c2cf740c03bf3a9c574af7b487ebcc45f6fc8b42.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                |  18 +--
 res/xml/cherish_settings_monet.xml            |  48 -------
 res/xml/cherish_settings_theme.xml            |  18 ---
 .../settings/fragments/ui/MonetEngine.java    | 123 ------------------
 4 files changed, 1 insertion(+), 206 deletions(-)
 delete mode 100644 res/xml/cherish_settings_monet.xml
 delete mode 100644 src/com/cherish/settings/fragments/ui/MonetEngine.java

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 30ee384..65c2fa2 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -519,7 +519,7 @@
     <string name="status_bar_battery_percentage_default">Hidden</string>
     <string name="status_bar_battery_percentage_text_next">Next to the icon</string>
     <string name="status_bar_battery_percentage_text_inside">Inside the icon</string>
-
+	
 	<!-- Status bar battery style-->
     <string name="status_bar_battery_style_title">Battery style</string>
     <string name="status_bar_battery_style_port">Portrait</string>
@@ -702,22 +702,6 @@
     <string name="quick_qs_brightness_slider_title">Show brightness slider in Quick QS Panel</string>
     <string name="quick_qs_brightness_slider_summary">Show a brightness slider in the quick qs panel</string>
 	
-	<!-- Monet Engine -->
-    <string name="monet_category">Monet</string>
-    <string name="monet_engine_title">Monet engine</string>
-    <string name="monet_engine_summary">Customize monet parameters</string>
-    <string name="monet_engine_custom_color_title">Use custom color</string>
-    <string name="monet_engine_custom_color_summary">Use custom color for monet engine instead of wallpaper colors</string>
-    <string name="monet_engine_color_override_title">Custom color</string>
-    <string name="monet_engine_white_luminance_user_title">White luminance</string>
-    <string name="monet_engine_accurate_shades_title">Use accurate shades</string>
-    <string name="monet_engine_chroma_factor_title">Chroma factor</string>
-    <string name="monet_engine_linear_lightness_title">Use linear lightness</string>
-
-	<!-- Black theme -->
-    <string name="system_black_theme_title">Use black theme</string>
-    <string name="system_black_theme_summary">Force black background colors</string>
-	
 	<!-- Volume rocker gestures -->
     <string name="volume_skiptrack_screen_title">Skip music tracks</string>
 	
diff --git a/res/xml/cherish_settings_monet.xml b/res/xml/cherish_settings_monet.xml
deleted file mode 100644
index bf7f2f3..0000000
--- a/res/xml/cherish_settings_monet.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020-22 The CherishOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-    android:title="@string/monet_engine_title">
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="monet_engine_custom_color"
-        android:title="@string/monet_engine_custom_color_title"
-        android:summary="@string/monet_engine_custom_color_summary"
-        android:defaultValue="false" />
-
-    <net.margaritov.preference.colorpicker.ColorPickerPreference
-        android:key="monet_engine_color_override"
-        android:title="@string/monet_engine_color_override_title"
-        android:dependency="monet_engine_custom_color"
-        android:defaultValue="0xffffff" />
-
-    <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-        android:key="monet_engine_white_luminance_user"
-        android:title="@string/monet_engine_white_luminance_user_title"
-        android:defaultValue="425"
-        android:max="1000"
-        settings:min="200"
-        settings:interval="25"/>
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="monet_engine_accurate_shades"
-        android:title="@string/monet_engine_accurate_shades_title"
-        android:defaultValue="true" />
-
-    <com.cherish.settings.preferences.SecureSettingSeekBarPreference
-        android:key="monet_engine_chroma_factor"
-        android:title="@string/monet_engine_chroma_factor_title"
-        android:defaultValue="100"
-        android:max="400"
-        settings:min="50"
-        settings:interval="25"/>
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="monet_engine_linear_lightness"
-        android:title="@string/monet_engine_linear_lightness_title"
-        android:defaultValue="false" />
-</PreferenceScreen>
diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 1fb7d82..69bb6b2 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -17,27 +17,9 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:title="@string/theme_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-		
-		<PreferenceCategory
-        android:key="settings_layout_category"
-        android:title="@string/settings_layout_category_title">
-
-    <com.cherish.settings.preferences.SecureSettingSwitchPreference
-        android:key="system_black_theme"
-        android:title="@string/system_black_theme_title"
-        android:summary="@string/system_black_theme_summary"
-        android:defaultValue="false" />
-
-    </PreferenceCategory>
 	
 	<PreferenceCategory
         android:title="@string/theme_customization_category">
-		
-		<Preference
-        android:key="monet_engine"
-        android:title="@string/monet_engine_title"
-        android:summary="@string/monet_engine_summary"
-        android:fragment="com.cherish.settings.fragments.MonetEngine" />
 
         <Preference
             android:key="dark_ui_mode"
diff --git a/src/com/cherish/settings/fragments/ui/MonetEngine.java b/src/com/cherish/settings/fragments/ui/MonetEngine.java
deleted file mode 100644
index 12c45b7..0000000
--- a/src/com/cherish/settings/fragments/ui/MonetEngine.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2020-2022 The CherishOS 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.fragments;
-
-import static android.os.UserHandle.USER_SYSTEM;
-
-import android.app.ActivityManagerNative;
-import android.app.UiModeManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.om.IOverlayManager;
-import android.content.om.OverlayInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.IWindowManager;
-import android.view.View;
-import android.view.WindowManagerGlobal;
-import android.widget.Toast;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.ListPreference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.Utils;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
-
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class MonetEngine extends SettingsPreferenceFragment implements OnPreferenceChangeListener {
-
-    private String MONET_ENGINE_COLOR_OVERRIDE = "monet_engine_color_override";
-
-    private ColorPickerPreference mMonetColor;
-    private Context mContext;
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        addPreferencesFromResource(R.xml.cherish_settings_monet);
-
-        mContext = getActivity();
-
-        final ContentResolver resolver = getActivity().getContentResolver();
-        final PreferenceScreen screen = getPreferenceScreen();
-
-        mMonetColor = (ColorPickerPreference) screen.findPreference(MONET_ENGINE_COLOR_OVERRIDE);
-        int intColor = Settings.Secure.getInt(resolver, MONET_ENGINE_COLOR_OVERRIDE, Color.WHITE);
-        String hexColor = String.format("#%08x", (0xffffff & intColor));
-        mMonetColor.setNewPreviewColor(intColor);
-        mMonetColor.setSummary(hexColor);
-        mMonetColor.setOnPreferenceChangeListener(this);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.CHERISH_SETTINGS;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        ContentResolver resolver = getActivity().getContentResolver();
-        if (preference == mMonetColor) {
-            String hex = ColorPickerPreference.convertToARGB(Integer
-                .parseInt(String.valueOf(newValue)));
-            preference.setSummary(hex);
-            int intHex = ColorPickerPreference.convertToColorInt(hex);
-            Settings.Secure.putInt(resolver,
-                MONET_ENGINE_COLOR_OVERRIDE, intHex);
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * For Search.
-     */
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.cherish_settings_monet);
-}