i9300: advanced setting: add content adaptive backlight control

Change-Id: I8979a7434265d76172d6d0180b37abaef61d8aaa

2 files changed, 72 insertions, 50 deletions

diff --git a/DeviceSettings/res/values/strings.xml b/DeviceSettings/res/values/strings.xml
index 5570385..1bf9807 100644
--- a/DeviceSettings/res/values/strings.xml
+++ b/DeviceSettings/res/values/strings.xml
@@ -2,22 +2,15 @@
 <resources>
     <string name="app_name">Advanced settings</string>
 
-    <string name="category_dock_title">Dock</string>
-    <string name="dockaudio_subcat_title">Dock Audio</string>
-    <string name="use_dock_audio_title_head">Use Dock USB Audio</string>
-    <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string>
-
-    <string name="category_haptic_title">Haptic</string>
-    <string name="vibrator_subcat_title">Vibrator</string>
-    <string name="vibrator_intensity_title_head">Vibrator Intensity</string>
-    <string name="vibrator_intensity_summary_head">Set vibrator intensity</string>
-
-    <string name="category_radio_title">Radio</string>
-    <string name="hspa_title_head">HSPA</string>
-    <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
-
+    <!-- Screen -->
     <string name="category_screen_title">Screen</string>
     <string name="mdnie_subcat_title">Colors</string>
+
+    <!-- CABC -->
+    <string name="cabc_title_head">CABC</string>
+    <string name="cabc_summary_head">Enable content adaptive backlight control</string>
+
+    <!-- mDNIe -->
     <string name="mdnie_scenario_title_head">Scenario</string>
     <string name="mdnie_scenario_summary_head">Set the mDNIe Scenario</string>
     <string name="mdnie_mode_title_head">Mode</string>
@@ -25,10 +18,12 @@
     <string name="mdnie_negative_title_head">Negative Mode</string>
     <string name="mdnie_negative_summary_head">Enable/Disable inverted colors</string>
 
+    <!-- LED -->
     <string name="led_subcat_title">Notification LED</string>
     <string name="led_fade_title_head">LED Fading</string>
     <string name="led_fade_summary_head">Enable LED smooth fading instead of sharp blinking.</string>
 
+    <!-- Touchkey -->
     <string name="touchkey_subcat_title">Touchkeys</string>
     <string name="touchkey_light_title_head">Backlight</string>
     <string name="touchkey_light_summary_off">Enable backlight</string>
@@ -36,4 +31,21 @@
     <string name="touchkey_timeout_title_head">Backlight timeout</string>
     <string name="touchkey_timeout_summary_head">Set timeout for the backlight</string>
 
+    <!-- Dock -->
+    <string name="category_dock_title">Dock</string>
+    <string name="dockaudio_subcat_title">Dock Audio</string>
+    <string name="use_dock_audio_title_head">Use Dock USB Audio</string>
+    <string name="use_dock_audio_summary_head">Use the passive audio out on the dock</string>
+
+    <!-- Haptic -->
+    <string name="category_haptic_title">Haptic</string>
+    <string name="vibrator_subcat_title">Vibrator</string>
+    <string name="vibrator_intensity_title_head">Vibrator Intensity</string>
+    <string name="vibrator_intensity_summary_head">Set vibrator intensity</string>
+
+    <!-- Radio -->
+    <string name="category_radio_title">Radio</string>
+    <string name="hspa_title_head">HSPA</string>
+    <string name="hspa_summary_head">Enable HSDPA/HSUPA</string>
+
 </resources>
diff --git a/DeviceSettings/res/xml/screen_preferences.xml b/DeviceSettings/res/xml/screen_preferences.xml
index aff39c0..313f22c 100644
--- a/DeviceSettings/res/xml/screen_preferences.xml
+++ b/DeviceSettings/res/xml/screen_preferences.xml
@@ -1,59 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!-- Screen -->
     <PreferenceCategory
-                android:title="@string/mdnie_subcat_title">
-    <!-- mDNIe Scenario modes -->
-    <com.cyanogenmod.settings.device.mDNIeScenario
-	        android:key="mdnie_scenario"
-	        android:title="@string/mdnie_scenario_title_head"
-	        android:summary="@string/mdnie_scenario_summary_head"
-	        android:entries="@array/mdnie_scenario_entries"
-  			android:entryValues="@array/mdnie_scenario_entries_values"
-  			android:defaultValue="0" />
+            android:title="@string/mdnie_subcat_title">
 
-    <!-- mDNIe Mode -->
-    <com.cyanogenmod.settings.device.mDNIeMode
-	        android:key="mdnie_mode"
-	        android:title="@string/mdnie_mode_title_head"
-	        android:summary="@string/mdnie_mode_summary_head"
-	        android:entries="@array/mdnie_mode_entries"
-  			android:entryValues="@array/mdnie_mode_entries_values"
-  			android:defaultValue="0" />
+        <!-- CABC -->
+        <com.cyanogenmod.settings.device.CABC
+                android:key="cabc"
+                android:title="@string/cabc_title_head"
+                android:summary="@string/cabc_summary_head"
+                android:defaultValue="true" />
 
-    <!-- mDNIe Negative mode -->
-    <com.cyanogenmod.settings.device.mDNIeNegative
-	        android:key="mdnie_negative"
-	        android:title="@string/mdnie_negative_title_head"
-	        android:summary="@string/mdnie_negative_summary_head"
-	        android:entries="@array/mdnie_negative_entries"
-  			android:entryValues="@array/mdnie_negative_entries_values"
-  			android:defaultValue="0" />
+        <!-- mDNIe Scenario modes -->
+        <com.cyanogenmod.settings.device.mDNIeScenario
+                android:key="mdnie_scenario"
+                android:title="@string/mdnie_scenario_title_head"
+                android:summary="@string/mdnie_scenario_summary_head"
+                android:entries="@array/mdnie_scenario_entries"
+                android:entryValues="@array/mdnie_scenario_entries_values"
+                android:defaultValue="0" />
+
+        <!-- mDNIe Mode -->
+        <com.cyanogenmod.settings.device.mDNIeMode
+                android:key="mdnie_mode"
+                android:title="@string/mdnie_mode_title_head"
+                android:summary="@string/mdnie_mode_summary_head"
+                android:entries="@array/mdnie_mode_entries"
+                android:entryValues="@array/mdnie_mode_entries_values"
+                android:defaultValue="0" />
+
+        <!-- mDNIe Negative mode -->
+        <com.cyanogenmod.settings.device.mDNIeNegative
+                android:key="mdnie_negative"
+                android:title="@string/mdnie_negative_title_head"
+                android:summary="@string/mdnie_negative_summary_head"
+                android:entries="@array/mdnie_negative_entries"
+                android:entryValues="@array/mdnie_negative_entries_values"
+                android:defaultValue="0" />
     </PreferenceCategory>
 
+    <!-- LED -->
     <PreferenceCategory
-                android:title="@string/led_subcat_title">
-    <!-- LED fading mode -->
-    <com.cyanogenmod.settings.device.LedFade
+            android:title="@string/led_subcat_title">
+        <!-- LED fading mode -->
+        <com.cyanogenmod.settings.device.LedFade
                 android:key="led_fade"
                 android:title="@string/led_fade_title_head"
                 android:summary="@string/led_fade_summary_head"
                 android:entries="@array/led_fade_entries"
-                        android:entryValues="@array/led_fade_entries_values"
-                        android:defaultValue="1" />
+                android:entryValues="@array/led_fade_entries_values"
+                android:defaultValue="1" />
     </PreferenceCategory>
 
+    <!-- Touchkeys -->
     <PreferenceCategory
-                android:title="@string/touchkey_subcat_title">
-    <!-- Touchkey backlight -->
-    <CheckBoxPreference
+            android:title="@string/touchkey_subcat_title">
+        <!-- Touchkey backlight -->
+        <CheckBoxPreference
                 android:key="touchkey_light"
                 android:title="@string/touchkey_light_title_head"
                 android:summaryOff="@string/touchkey_light_summary_off"
                 android:summaryOn="@string/touchkey_light_summary_on"
-                android:defaultValue="true"
-                />
-    <com.cyanogenmod.settings.device.TouchkeyTimeout
+                android:defaultValue="true" />
+        <com.cyanogenmod.settings.device.TouchkeyTimeout
                 android:key="touchkey_timeout"
                 android:title="@string/touchkey_timeout_title_head"
                 android:summary="@string/touchkey_timeout_summary_head"