livedisplay: Moving LiveDisplay to CMSDK

 * Remove all LiveDisplay-related code from the framework, and
   update the QS tile for the new API.

Change-Id: I41c04a254afa91c0ed26c050362b63049d489fba

1 files changed, 1 insertions, 23 deletions

diff --git a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
index 1b4182d..4e4c249 100644
--- a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
+++ b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
@@ -31,7 +31,7 @@ import cyanogenmod.providers.CMSettings;
 /**
  * Utility methods for performing accessibility display adjustments.
  */
-public class DisplayAdjustmentUtils {
+class DisplayAdjustmentUtils {
     private static final String LOG_TAG = DisplayAdjustmentUtils.class.getSimpleName();
 
     /** Matrix and offset used for converting color to gray-scale. */
@@ -77,11 +77,6 @@ public class DisplayAdjustmentUtils {
             return true;
         }
 
-        if (CMSettings.Secure.getStringForUser(cr,
-                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId) != null) {
-            return true;
-        }
-
         return false;
     }
 
@@ -97,23 +92,6 @@ public class DisplayAdjustmentUtils {
             colorMatrix = multiply(colorMatrix, INVERSION_MATRIX_VALUE_ONLY);
         }
 
-        String adj = CMSettings.Secure.getStringForUser(cr,
-                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId);
-        if (adj != null) {
-            String[] tmp = adj.split(" ");
-            if (tmp.length == 16) {
-                float[] adjMatrix = new float[16];
-                try {
-                    for (int i = 0; i < 16; i++) {
-                        adjMatrix[i] = Float.parseFloat(tmp[i]);
-                    }
-                    colorMatrix = multiply(colorMatrix, adjMatrix);
-                } catch (NumberFormatException e) {
-                    Slog.e(LOG_TAG, e.getMessage(), e);
-                }
-            }
-        }
-
         if (Settings.Secure.getIntForUser(cr,
                 Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0, userId) != 0) {
             final int daltonizerMode = Settings.Secure.getIntForUser(cr,