From 69a604b199fc3b4a802a84ad7a1b279bad9cd0e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C6=B0ng=20Phan?= <phandinhhungvp2001@gmail.com>
Date: Sun, 6 Dec 2020 10:31:43 +0700
Subject: [PATCH] Revert "Cherish:Add pref for qs brightness slider position
 [2/2]"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 31e425c4daba76965b5c1d36f08ec0a127560916.

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                |  6 --
 res/xml/brightness_slider.xml                 | 25 -------
 res/xml/cherish_settings_quicksettings.xml    |  3 +
 .../fragments/BrightnessSliderSettings.java   | 70 -------------------
 .../settings/fragments/QuickSettings.java     | 18 +----
 5 files changed, 5 insertions(+), 117 deletions(-)
 delete mode 100644 res/xml/brightness_slider.xml
 delete mode 100644 src/com/cherish/settings/fragments/BrightnessSliderSettings.java

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 8059e4f..7e1b169 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -300,12 +300,6 @@
     <string name="global_actions_max_columns_title">Max actions to show</string>
     <string name="global_actions_max_columns_summary">Set how many actions to show before buttons move to overflow menu</string>
 
-    <!-- Brightness slider -->
-    <string name="qs_show_brightness_title">Brightness slider</string>
-    <string name="qs_show_brightness_summary">Brightness slider visability and settings</string>
-    <string name="qs_brightness_position_bottom_title">Bottom brightness slider</string>
-    <string name="qs_brightness_position_bottom_summary">Show the brightness slider on the bottom of QS</string>
-
     <!-- Battery Styles -->
     <string name="battery_style_category_title">Battery level</string>
 
diff --git a/res/xml/brightness_slider.xml b/res/xml/brightness_slider.xml
deleted file mode 100644
index 79ac9dd..0000000
--- a/res/xml/brightness_slider.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 CherishOS
-     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/qs_show_brightness_title"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
-    <com.cherish.settings.preferences.SystemSettingSwitchPreference
-        android:key="qs_brightness_position_bottom"
-		 android:icon="@drawable/ic_brightness"
-        android:title="@string/qs_brightness_position_bottom_title"
-        android:summary="@string/qs_brightness_position_bottom_summary"
-        android:defaultValue="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/cherish_settings_quicksettings.xml b/res/xml/cherish_settings_quicksettings.xml
index 00aa7a2..fdb4ab2 100644
--- a/res/xml/cherish_settings_quicksettings.xml
+++ b/res/xml/cherish_settings_quicksettings.xml
@@ -17,6 +17,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/quicksettings_title"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+<<<<<<< HEAD
 
   <PreferenceCategory
         android:title="@string/qs_category">
@@ -75,6 +76,8 @@
             android:summary="@string/qs_show_brightness_summary"
             android:fragment="com.cherish.settings.fragments.BrightnessSliderSettings"
             android:defaultValue="true" />
+=======
+>>>>>>> parent of 31e425c4 (Cherish:Add pref for qs brightness slider position [2/2])
 
         <com.cherish.settings.preferences.SystemSettingSwitchPreference
         android:key="status_bar_brightness_control"
diff --git a/src/com/cherish/settings/fragments/BrightnessSliderSettings.java b/src/com/cherish/settings/fragments/BrightnessSliderSettings.java
deleted file mode 100644
index 9da44d1..0000000
--- a/src/com/cherish/settings/fragments/BrightnessSliderSettings.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2020 CherishOS
- *
- * 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 android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.preference.ListPreference;
-import androidx.preference.SwitchPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class BrightnessSliderSettings extends SettingsPreferenceFragment implements
-        Preference.OnPreferenceChangeListener {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.brightness_slider);
-        final Resources res = getResources();
-        final ContentResolver resolver = getActivity().getContentResolver();
-        final PreferenceScreen prefScreen = getPreferenceScreen();
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        final ContentResolver resolver = getContentResolver();
-        return false;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
-    }
-
-}
diff --git a/src/com/cherish/settings/fragments/QuickSettings.java b/src/com/cherish/settings/fragments/QuickSettings.java
index d7326c0..f4797ab 100644
--- a/src/com/cherish/settings/fragments/QuickSettings.java
+++ b/src/com/cherish/settings/fragments/QuickSettings.java
@@ -31,12 +31,10 @@ import java.util.ArrayList;
 
 public class QuickSettings extends SettingsPreferenceFragment implements
         OnPreferenceChangeListener {
-	
-   private static final String BRIGHTNESS_SLIDER = "qs_show_brightness";
+
    private static final String FOOTER_TEXT_STRING = "footer_text_string";
    private static final String STATUS_BAR_CUSTOM_HEADER = "status_bar_custom_header";
 
-    private SystemSettingMasterSwitchPreference mBrightnessSlider;
     private SystemSettingEditTextPreference mFooterString;
     private SystemSettingMasterSwitchPreference mCustomHeader;
 
@@ -48,13 +46,6 @@ public class QuickSettings extends SettingsPreferenceFragment implements
 
         PreferenceScreen prefScreen = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
-		
-		mBrightnessSlider = (SystemSettingMasterSwitchPreference)
-                findPreference(BRIGHTNESS_SLIDER);
-        mBrightnessSlider.setOnPreferenceChangeListener(this);
-        boolean enabled = Settings.System.getInt(resolver,
-                BRIGHTNESS_SLIDER, 1) == 1;
-        mBrightnessSlider.setChecked(enabled);
 
         mCustomHeader = (SystemSettingMasterSwitchPreference) findPreference(STATUS_BAR_CUSTOM_HEADER);
         int qsHeader = Settings.System.getInt(resolver,
@@ -78,12 +69,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         ContentResolver resolver = getActivity().getContentResolver();
-		if (preference == mBrightnessSlider) {
-            Boolean value = (Boolean) newValue;
-            Settings.System.putInt(resolver,
-                    BRIGHTNESS_SLIDER, value ? 1 : 0);
-            return true;
-        } else if (preference == mFooterString) {
+         if (preference == mFooterString) {
             String value = (String) newValue;
             if (value != "" && value != null)
                 Settings.System.putString(getActivity().getContentResolver(),