From 2abc20c0daf70b63ae00569e3fb20d21118f909c Mon Sep 17 00:00:00 2001 From: Javier Ferrer Date: Sat, 8 Jun 2013 02:18:27 +0200 Subject: i9300: advanced setting: add content adaptive backlight control Change-Id: I8979a7434265d76172d6d0180b37abaef61d8aaa --- DeviceSettings/Android.mk | 2 +- DeviceSettings/res/values/strings.xml | 40 +++++++---- DeviceSettings/res/xml/screen_preferences.xml | 82 ++++++++++++---------- .../src/com/cyanogenmod/settings/device/CABC.java | 58 +++++++++++++++ .../settings/device/DeviceSettings.java | 5 +- .../settings/device/DockFragmentActivity.java | 2 +- .../settings/device/HapticFragmentActivity.java | 2 +- .../settings/device/RadioFragmentActivity.java | 2 +- .../settings/device/ScreenFragmentActivity.java | 8 ++- .../com/cyanogenmod/settings/device/Startup.java | 1 + .../src/com/cyanogenmod/settings/device/Utils.java | 6 +- i9300.mk | 2 +- 12 files changed, 148 insertions(+), 62 deletions(-) create mode 100644 DeviceSettings/src/com/cyanogenmod/settings/device/CABC.java diff --git a/DeviceSettings/Android.mk b/DeviceSettings/Android.mk index 12c8de5..6605185 100644 --- a/DeviceSettings/Android.mk +++ b/DeviceSettings/Android.mk @@ -7,7 +7,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13 LOCAL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_PACKAGE_NAME := GalaxyS3Settings +LOCAL_PACKAGE_NAME := DeviceSettings LOCAL_CERTIFICATE := platform include $(BUILD_PACKAGE) 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 @@ Advanced settings - Dock - Dock Audio - Use Dock USB Audio - Use the passive audio out on the dock - - Haptic - Vibrator - Vibrator Intensity - Set vibrator intensity - - Radio - HSPA - Enable HSDPA/HSUPA - + Screen Colors + + + CABC + Enable content adaptive backlight control + + Scenario Set the mDNIe Scenario Mode @@ -25,10 +18,12 @@ Negative Mode Enable/Disable inverted colors + Notification LED LED Fading Enable LED smooth fading instead of sharp blinking. + Touchkeys Backlight Enable backlight @@ -36,4 +31,21 @@ Backlight timeout Set timeout for the backlight + + Dock + Dock Audio + Use Dock USB Audio + Use the passive audio out on the dock + + + Haptic + Vibrator + Vibrator Intensity + Set vibrator intensity + + + Radio + HSPA + Enable HSDPA/HSUPA + 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 @@ + - - + android:title="@string/mdnie_subcat_title"> - - + + - - + + + + + + + + + - - + + + android:entryValues="@array/led_fade_entries_values" + android:defaultValue="1" /> + - - + + - +