summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xBoardConfig.mk5
-rw-r--r--cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java88
2 files changed, 4 insertions, 89 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 9d2ce3b..dd618e2 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -22,7 +22,10 @@ DEVICE_FOLDER := device/samsung/tuna
PRODUCT_VENDOR_KERNEL_HEADERS += $(DEVICE_FOLDER)/kernel-headers
# CM
-BOARD_HARDWARE_CLASS := $(DEVICE_FOLDER)/cmhw
+BOARD_HARDWARE_CLASS += \
+ $(DEVICE_FOLDER)/cmhw \
+ $(OMAP4_NEXT_FOLDER)/cmhw
+
BACKLIGHT_PATH := "/sys/class/backlight/s6e8aa0/brightness"
# Use the non-open-source parts, if they're present
diff --git a/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java b/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java
deleted file mode 100644
index b021e6c..0000000
--- a/cmhw/org/cyanogenmod/hardware/DisplayColorCalibration.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2013 The CyanogenMod 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 org.cyanogenmod.hardware;
-
-import org.cyanogenmod.hardware.util.FileUtils;
-import java.io.File;
-
-public class DisplayColorCalibration {
- private static final String[] COLOR_FILE = new String[] {
- "/sys/class/misc/samoled_color/red_multiplier",
- "/sys/class/misc/samoled_color/green_multiplier",
- "/sys/class/misc/samoled_color/blue_multiplier"
- };
- private static final String COLOR_FILE_V2 = "/sys/class/misc/colorcontrol/multiplier";
-
- public static boolean isSupported() {
- if (new File(COLOR_FILE_V2).exists()) {
- return true;
- }
- for (String filePath : COLOR_FILE) {
- if (!new File(filePath).exists()) {
- return false;
- }
- }
- return true;
- }
-
- public static int getMaxValue() {
- return 2000000000; // Real value: 4000000000
- }
-
- public static int getMinValue() {
- return 0;
- }
-
- public static int getDefValue() {
- return 1000000000; // Real value: 2000000000
- }
-
- public static String getCurColors() {
- StringBuilder values = new StringBuilder();
- if (new File(COLOR_FILE_V2).exists()) {
- String[] valuesSplit = FileUtils.readOneLine(COLOR_FILE_V2).split(" ");
- for (int i = 0; i < valuesSplit.length; i++) {
- values.append(Long.toString(Long.valueOf(valuesSplit[i]) / 2)).append(" ");
- }
- } else {
- for (String filePath : COLOR_FILE) {
- values.append(Long.toString(Long.valueOf(
- FileUtils.readOneLine(filePath)) / 2)).append(" ");
- }
- }
- return values.toString();
- }
-
- public static boolean setColors(String colors) {
- String[] valuesSplit = colors.split(" ");
- if (new File(COLOR_FILE_V2).exists()) {
- StringBuilder realColors = new StringBuilder();
- for (int i = 0; i < valuesSplit.length; i++) {
- realColors.append(Long.toString(Long.valueOf(valuesSplit[i]) * 2)).append(" ");
- }
- return FileUtils.writeLine(COLOR_FILE_V2, realColors.toString());
- } else {
- boolean result = true;
- for (int i = 0; i < valuesSplit.length; i++) {
- String targetFile = COLOR_FILE[i];
- result &= FileUtils.writeLine(targetFile, Long.toString(
- Long.valueOf(valuesSplit[i]) * 2));
- }
- return result;
- }
- }
-}