fw: Move Secure settings to CMSettings

This moves all Settings.Secure.* settings that, were added to
CyanogenMod, to CMSettings.

 * KEYBOARD_BRIGHTNESS
 * BUTTON_BRIGHTNESS
 * BUTTON_BACKLIGHT_TIMEOUT
 * DEV_FORCE_SHOW_NAVBAR
 * ADB_NOTIFY
 * ADB_PORT
 * DEVICE_HOSTNAME
 * KILL_APP_LONGPRESS_BACK
 * PROTECTED_COMPONENTS
 * LIVE_DISPLAY_COLOR_MATRIX
 * ADVANCED_REBOOT
 * POWER_MENU_ACTIONS
 * DEFAULT_THEME_COMPONENTS
 * THEME_PREV_BOOT_API_LEVEL

Change-Id: I49e9160177ffc727b20008817ac2b5ce5e89ead5

2 files changed, 7 insertions, 4 deletions

diff --git a/services/accessibility/Android.mk b/services/accessibility/Android.mk
index d98fc28..39355a7 100644
--- a/services/accessibility/Android.mk
+++ b/services/accessibility/Android.mk
@@ -7,4 +7,6 @@ LOCAL_MODULE := services.accessibility
 LOCAL_SRC_FILES += \
       $(call all-java-files-under,java)
 
+LOCAL_JAVA_LIBRARIES += org.cyanogenmod.platform.internal
+
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
index ab8eacf..1b4182d 100644
--- a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
+++ b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
@@ -26,6 +26,7 @@ import android.os.ServiceManager;
 import android.provider.Settings;
 import android.util.Slog;
 import android.view.accessibility.AccessibilityManager;
+import cyanogenmod.providers.CMSettings;
 
 /**
  * Utility methods for performing accessibility display adjustments.
@@ -76,8 +77,8 @@ public class DisplayAdjustmentUtils {
             return true;
         }
 
-        if (Settings.Secure.getStringForUser(cr,
-                Settings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId) != null) {
+        if (CMSettings.Secure.getStringForUser(cr,
+                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId) != null) {
             return true;
         }
 
@@ -96,8 +97,8 @@ public class DisplayAdjustmentUtils {
             colorMatrix = multiply(colorMatrix, INVERSION_MATRIX_VALUE_ONLY);
         }
 
-        String adj = Settings.Secure.getStringForUser(cr,
-                Settings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId);
+        String adj = CMSettings.Secure.getStringForUser(cr,
+                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId);
         if (adj != null) {
             String[] tmp = adj.split(" ");
             if (tmp.length == 16) {