From af4ed56b1460ddc90da8028c7b3171ed6836aa08 Mon Sep 17 00:00:00 2001
From: xyyx <xyyx@mail.ru>
Date: Mon, 20 Aug 2018 16:33:58 +0800
Subject: [PATCH] ButtonBrightness: use switch for devices without variable
 button brightness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
---
 res/values/cherish_strings.xml                |  2 ++
 res/xml/cherish_settings_button.xml           |  5 +++
 .../settings/fragments/ButtonSettings.java    | 32 ++++++++++++++++---
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 5077de4..544f633 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -177,4 +177,6 @@
 
     <!-- Enable keys backlight-->
     <string name="button_brightness_title">Backlight</string>
+    <!-- Enable keys backlight-->
+    <string name="button_brightness_sw_title">Enable backlight</string>
 </resources>
diff --git a/res/xml/cherish_settings_button.xml b/res/xml/cherish_settings_button.xml
index 8252330..1776f3e 100644
--- a/res/xml/cherish_settings_button.xml
+++ b/res/xml/cherish_settings_button.xml
@@ -43,6 +43,11 @@
             settings:units=""
             android:persistent="false" />
 
+        <SwitchPreference
+            android:key="button_brightness_sw"
+            android:title="@string/button_brightness_sw_title"
+            android:persistent="false" />
+
         <ListPreference
             android:dialogTitle="@string/backlight_timeout_title"
             android:entries="@array/backlight_timeout_entries"
diff --git a/src/com/cherish/settings/fragments/ButtonSettings.java b/src/com/cherish/settings/fragments/ButtonSettings.java
index 4833631..eb61c48 100644
--- a/src/com/cherish/settings/fragments/ButtonSettings.java
+++ b/src/com/cherish/settings/fragments/ButtonSettings.java
@@ -45,6 +45,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
 
     //Keys
     private static final String KEY_BUTTON_BRIGHTNESS = "button_brightness";
+    private static final String KEY_BUTTON_BRIGHTNESS_SW = "button_brightness_sw";
     private static final String KEY_BACKLIGHT_TIMEOUT = "backlight_timeout";
 
     // category keys
@@ -52,6 +53,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
 
     private ListPreference mBacklightTimeout;
     private CustomSeekBarPreference mButtonBrightness;
+    private SwitchPreference mButtonBrightness_sw;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -60,10 +62,15 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
 
         final PreferenceScreen prefScreen = getPreferenceScreen();
 
+        final boolean variableBrightness = getResources().getBoolean(
+                com.android.internal.R.bool.config_deviceHasVariableButtonBrightness);
+
         mBacklightTimeout =
                 (ListPreference) findPreference(KEY_BACKLIGHT_TIMEOUT);
         mButtonBrightness =
                 (CustomSeekBarPreference) findPreference(KEY_BUTTON_BRIGHTNESS);
+        mButtonBrightness_sw =
+                (SwitchPreference) findPreference(KEY_BUTTON_BRIGHTNESS_SW);
 
         if (mBacklightTimeout != null) {
             mBacklightTimeout.setOnPreferenceChangeListener(this);
@@ -73,11 +80,21 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
             mBacklightTimeout.setSummary(mBacklightTimeout.getEntry());
         }
 
-        if (mButtonBrightness != null) {
-            int ButtonBrightness = Settings.System.getInt(getContentResolver(),
-                    Settings.System.BUTTON_BRIGHTNESS, 255);
-            mButtonBrightness.setValue(ButtonBrightness / 1);
-            mButtonBrightness.setOnPreferenceChangeListener(this);
+        if (variableBrightness) {
+            prefScreen.removePreference(mButtonBrightness_sw);
+            if (mButtonBrightness != null) {
+                int ButtonBrightness = Settings.System.getInt(getContentResolver(),
+                        Settings.System.BUTTON_BRIGHTNESS, 255);
+                mButtonBrightness.setValue(ButtonBrightness / 1);
+                mButtonBrightness.setOnPreferenceChangeListener(this);
+            }
+        } else {
+            prefScreen.removePreference(mButtonBrightness);
+            if (mButtonBrightness_sw != null) {
+                mButtonBrightness_sw.setChecked((Settings.System.getInt(getContentResolver(),
+                        Settings.System.BUTTON_BRIGHTNESS, 1) == 1));
+                mButtonBrightness_sw.setOnPreferenceChangeListener(this);
+            }
         }
     }
 
@@ -98,6 +115,11 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
             Settings.System.putInt(getActivity().getContentResolver(),
                     Settings.System.BUTTON_BRIGHTNESS, value * 1);
             return true;
+        } else if (preference == mButtonBrightness_sw) {
+            boolean value = (Boolean) newValue;
+            Settings.System.putInt(getActivity().getContentResolver(),
+                    Settings.System.BUTTON_BRIGHTNESS, value ? 1 : 0);
+            return true;
         }
         return false;
     }