Settings: Split battery light toggle into charging & low battery [2/2]

 * also cleanup preference controller code

Author: adithya2306

res/values-ru/wave_strings.xml

@@ -75,10 +75,6 @@
     <string name="ambient_notification_light_color_automatic_title">Цвет уведомления</string>
     <string name="pulse_ambient_light_color">Цвет подсветки</string>
 
-    <!-- Battery light -->
-    <string name="battery_light_title">Индикация батареи</string>
-    <string name="battery_light_summary">Настроить цвет индикатора на основе уровня заряда батареи и статуса</string>
-
     <!-- Lockscreen battery info indicator  -->
     <string name="lockscreen_battery_info_title">Информация о батарее на экране блокировки</string>
     <string name="lockscreen_battery_info_summary">Показывать ток зарядки, напряжение и температуру аккумулятора на экране блокировки во время зарядки</string>

res/values/wave_strings.xml

@@ -78,8 +78,10 @@
     <string name="pulse_ambient_light_color">When pulsing, use</string>
 
     <!-- Battery light -->
-    <string name="battery_light_title">Battery light</string>
-    <string name="battery_light_summary">Turn on the light while charging and blink when battery is low</string>
+    <string name="charging_battery_light_title">Charging battery light</string>
+    <string name="charging_battery_light_summary">Turn on light while charging battery</string>
+    <string name="low_battery_light_title">Low battery light</string>
+    <string name="low_battery_light_summary">Blink light when battery is low</string>
 
     <!-- Lockscreen battery info indicator  -->
     <string name="lockscreen_battery_info_title">Lockscreen charging info</string>

res/xml/configure_notification_settings.xml

@@ -134,10 +134,16 @@
 
         <!-- Battery light -->
         <SwitchPreference
-            android:key="battery_light_enabled"
-            android:title="@string/battery_light_title"
-            android:summary="@string/battery_light_summary"
-            settings:controller="com.android.settings.notification.BatteryLightPreferenceController"/>
+            android:key="charging_battery_light_enabled"
+            android:title="@string/charging_battery_light_title"
+            android:summary="@string/charging_battery_light_summary"
+            settings:controller="com.android.settings.notification.ChargingBatteryLightPreferenceController"/>
+
+        <SwitchPreference
+            android:key="low_battery_light_enabled"
+            android:title="@string/low_battery_light_title"
+            android:summary="@string/low_battery_light_summary"
+            settings:controller="com.android.settings.notification.LowBatteryLightPreferenceController"/>
 
         <!-- Default notification ringtone -->
         <com.android.settings.DefaultRingtonePreference

src/com/android/settings/notification/BatteryLightPreferenceController.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016 The Android Open Source 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.android.settings.notification;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import static android.provider.Settings.Global.CHARGING_BATTERY_LIGHT_ENABLED;
+
+public class ChargingBatteryLightPreferenceController extends TogglePreferenceController {
+
+    public ChargingBatteryLightPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_intrusiveNotificationLed) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        boolean enabledByDefault = mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.config_intrusiveBatteryLed);
+        return Settings.Global.getInt(mContext.getContentResolver(), CHARGING_BATTERY_LIGHT_ENABLED,
+                enabledByDefault ? 1 : 0) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Global.putInt(mContext.getContentResolver(), CHARGING_BATTERY_LIGHT_ENABLED,
+                isChecked ? 1 : 0);
+    }
+
+}

src/com/android/settings/notification/ChargingBatteryLightPreferenceController.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2016 The Android Open Source 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.android.settings.notification;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import static android.provider.Settings.Global.LOW_BATTERY_LIGHT_ENABLED;
+
+public class LowBatteryLightPreferenceController extends TogglePreferenceController {
+
+    public LowBatteryLightPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_intrusiveNotificationLed) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        boolean enabledByDefault = mContext.getResources().getBoolean(
+                        com.android.internal.R.bool.config_intrusiveBatteryLed);
+        return Settings.Global.getInt(mContext.getContentResolver(), LOW_BATTERY_LIGHT_ENABLED,
+                enabledByDefault ? 1 : 0) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Global.putInt(mContext.getContentResolver(), LOW_BATTERY_LIGHT_ENABLED,
+                isChecked ? 1 : 0);
+    }
+
+}