GNexusParts improvements

- Fixed button's layout
- Color Adjustment more user friendly
- Warning for values greater than 200 in color adj.
- Presets changes for new values
- Fixed translations for es, en

PatchSet 2:
- Fixed translations for ru, de
- Better button's layout
- Color&Gamma presets can be disabled now if it's not supported by kernel

PatchSet 3:
- Changes in the names of the presets
- Restore original credits

Change-Id: I9c5cefd3f57bc5bd1f59a6b3c13a366225d0043c

5 files changed, 89 insertions, 74 deletions

diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java b/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java
index 84b4210..94a638d 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/ColorHackPresets.java
@@ -55,7 +55,7 @@ public class ColorHackPresets extends DialogPreference implements OnClickListene
     private static int sInstances = 0;
 
     // Align MAX_VALUE with Voodoo Control settings
-    private static final int MAX_VALUE = Integer.MAX_VALUE - 2;
+    private static final int MAX_VALUE = 2000000000;
 
     public ColorHackPresets(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -113,6 +113,11 @@ public class ColorHackPresets extends DialogPreference implements OnClickListene
      */
     public static boolean isSupported() {
         boolean supported = true;
+        for (String filePath : FILE_PATH_MULTI) {
+            if (!Utils.fileExists(filePath)) {
+                supported = false;
+            }
+        }
         for (String filePath : FILE_PATH_GAMMA) {
             if (!Utils.fileExists(filePath)) {
                 supported = false;
@@ -157,9 +162,9 @@ public class ColorHackPresets extends DialogPreference implements OnClickListene
     }
 
     private void Preset1() {
-        WriteMultiplier(1.0, 0);
-        WriteMultiplier(1.0, 1);
-        WriteMultiplier(1.0, 2);
+        WriteMultiplier(0.5, 0);
+        WriteMultiplier(0.5, 1);
+        WriteMultiplier(0.5, 2);
         WriteGamma(0, 0);
         WriteGamma(0, 1);
         WriteGamma(0, 2);
@@ -167,21 +172,23 @@ public class ColorHackPresets extends DialogPreference implements OnClickListene
     }
 
     private void Preset2() {
-        WriteMultiplier(0.8575, 0);
-        WriteMultiplier(0.8575, 1);
-        WriteMultiplier(0.8575, 2);
-        WriteGamma(-12, 0);
-        WriteGamma(12, 1);
-        WriteGamma(-12, 2);
+        WriteMultiplier(1.0, 0);
+        WriteMultiplier(1.0, 1);
+        WriteMultiplier(1.0, 2);
+        WriteGamma(0, 0);
+        WriteGamma(0, 1);
+        WriteGamma(0, 2);
+        WriteGamma(0, 3);
     }
 
     private void Preset3() {
-        WriteMultiplier(0.458602179, 0);
-        WriteMultiplier(0.6311828147, 1);
-        WriteMultiplier(0.82258, 2);
-        WriteGamma(-31, 0);
-        WriteGamma(-18, 1);
-        WriteGamma(-0, 2);
+        WriteMultiplier(0.35, 0);
+        WriteMultiplier(0.38, 1);
+        WriteMultiplier(0.5, 2);
+        WriteGamma(0, 0);
+        WriteGamma(0, 1);
+        WriteGamma(0, 2);
+        WriteGamma(0, 3);
     }
 
     private void Preset4() {
@@ -191,6 +198,7 @@ public class ColorHackPresets extends DialogPreference implements OnClickListene
         WriteGamma(-31, 0);
         WriteGamma(-30, 1);
         WriteGamma(-14, 2);
+        WriteGamma(0, 3);
     }
 
     private void Preset5() {
@@ -200,15 +208,17 @@ public class ColorHackPresets extends DialogPreference implements OnClickListene
         WriteGamma(-44, 0);
         WriteGamma(-44, 1);
         WriteGamma(-7, 2);
+        WriteGamma(0, 3);
     }
 
     private void Preset6() {
-        WriteMultiplier(1.0, 0);
-        WriteMultiplier(0.7688, 1);
-        WriteMultiplier(0.2473, 2);
-        WriteGamma(-57, 0);
-        WriteGamma(-75, 1);
-        WriteGamma(45, 2);
+        WriteMultiplier(0.45, 0);
+        WriteMultiplier(0.48, 1);
+        WriteMultiplier(0.5, 2);
+        WriteGamma(-4, 0);
+        WriteGamma(0, 1);
+        WriteGamma(5, 2);
+        WriteGamma(0, 3);
     }
 
 }
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java b/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java
index 0ca7ae2..25cbeb7 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/ColorTuningPreference.java
@@ -58,7 +58,7 @@ public class ColorTuningPreference extends DialogPreference implements OnClickLi
     private ColorSeekBar mSeekBars[] = new ColorSeekBar[3];
 
     // Align MAX_VALUE with Voodoo Control settings
-    private static final int MAX_VALUE = Integer.MAX_VALUE - 2;
+    private static final int MAX_VALUE = 2000000000;
 
     // Track instances to know when to restore original color
     // (when the orientation changes, a new dialog is created before the old one
@@ -86,12 +86,12 @@ public class ColorTuningPreference extends DialogPreference implements OnClickLi
     }
 
     private void SetupButtonClickListeners(View view) {
-            Button mDefaultButton = (Button)view.findViewById(R.id.btnColorDefault);
-            Button mCMButton = (Button)view.findViewById(R.id.btnColorCM);
-            Button mDarkButton = (Button)view.findViewById(R.id.btnColorDark);
-            mDefaultButton.setOnClickListener(this);
-            mCMButton.setOnClickListener(this);
-            mDarkButton.setOnClickListener(this);
+            Button mButton1 = (Button)view.findViewById(R.id.btnColor1);
+            Button mButton2 = (Button)view.findViewById(R.id.btnColor2);
+            Button mButton3 = (Button)view.findViewById(R.id.btnColor3);
+            mButton1.setOnClickListener(this);
+            mButton2.setOnClickListener(this);
+            mButton3.setOnClickListener(this);
     }
 
     @Override
@@ -117,11 +117,11 @@ public class ColorTuningPreference extends DialogPreference implements OnClickLi
      * @param context The context to read the SharedPreferences from
      */
     public static void restore(Context context) {
-        int iValue, iValue2;
         if (!isSupported()) {
             return;
         }
 
+        int iValue, iValue2;
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         for (String filePath : FILE_PATH) {
@@ -220,7 +220,7 @@ public class ColorTuningPreference extends DialogPreference implements OnClickLi
         }
 
         private void updateValue(int progress) {
-            mValueDisplay.setText(String.format("%.10f", (double) progress / MAX_VALUE));
+            mValueDisplay.setText(String.format("%d", (int) progress / 5000000));
         }
 
         public void SetNewValue(int iValue) {
@@ -232,33 +232,33 @@ public class ColorTuningPreference extends DialogPreference implements OnClickLi
 
     public void onClick(View v) {
         switch(v.getId()){
-            case R.id.btnColorDefault:
-                    SetDefaultSettings();
+            case R.id.btnColor1:
+                    SetSettings1();
                     break;
-            case R.id.btnColorCM:
-                    SetCMSettings();
+            case R.id.btnColor2:
+                    SetSettings2();
                     break;
-            case R.id.btnColorDark:
-                    SetDarkSettings();
+            case R.id.btnColor3:
+                    SetSettings3();
                     break;
         }
     }
 
-    private void SetCMSettings() {
-        mSeekBars[0].SetNewValue(1766478464);
-        mSeekBars[1].SetNewValue(1766478464);
-        mSeekBars[2].SetNewValue(1766478464);
+    private void SetSettings1() {
+        mSeekBars[0].SetNewValue(1000000000);
+        mSeekBars[1].SetNewValue(1000000000);
+        mSeekBars[2].SetNewValue(1000000000);
     }
 
-    private void SetDarkSettings() {
-        mSeekBars[0].SetNewValue(877466432);
-        mSeekBars[1].SetNewValue(877466432);
-        mSeekBars[2].SetNewValue(877466432);
+    private void SetSettings2() {
+        mSeekBars[0].SetNewValue(1750000000);
+        mSeekBars[1].SetNewValue(1750000000);
+        mSeekBars[2].SetNewValue(1750000000);
     }
 
-    private void SetDefaultSettings() {
-        mSeekBars[0].SetNewValue(MAX_VALUE);
-        mSeekBars[1].SetNewValue(MAX_VALUE);
-        mSeekBars[2].SetNewValue(MAX_VALUE);
+    private void SetSettings3() {
+        mSeekBars[0].SetNewValue(900000000);
+        mSeekBars[1].SetNewValue(960000000);
+        mSeekBars[2].SetNewValue(1000000000);
     }
 }
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
index 93e271d..6442998 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java
@@ -43,6 +43,7 @@ public class DeviceSettings extends Activity {
     public static final String ACTION_UPDATE_PREFERENCES = "com.cyanogenmod.settings.device.UPDATE";
     public static final String KEY_COLOR_TUNING = "color_tuning";
     public static final String KEY_GAMMA_TUNING = "gamma_tuning";
+    public static final String KEY_COLORGAMMA_PRESETS = "colorgamma_presets";
     public static final String KEY_VIBRATOR_TUNING = "vibrator_tuning";
     public static final String KEY_CATEGORY_RADIO = "category_radio";
     public static final String KEY_HSPA = "hspa";
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java b/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java
index b2ae578..fcb7ec0 100755
--- a/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/DisplayFragmentActivity.java
@@ -33,6 +33,7 @@ public class DisplayFragmentActivity extends PreferenceFragment {
 
     private ColorTuningPreference mColorTuning;
     private GammaTuningPreference mGammaTuning;
+    private ColorHackPresets mColorHackPresets;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -45,6 +46,9 @@ public class DisplayFragmentActivity extends PreferenceFragment {
 
         mGammaTuning = (GammaTuningPreference) findPreference(DeviceSettings.KEY_GAMMA_TUNING);
         mGammaTuning.setEnabled(GammaTuningPreference.isSupported());
+
+        mColorHackPresets = (ColorHackPresets) findPreference(DeviceSettings.KEY_COLORGAMMA_PRESETS);
+        mColorHackPresets.setEnabled(ColorHackPresets.isSupported());
     }
 
 }
diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java b/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java
index 749398b..3c5aef0 100644
--- a/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java
+++ b/GNexusParts/src/com/cyanogenmod/settings/device/GammaTuningPreference.java
@@ -91,12 +91,12 @@ public class GammaTuningPreference extends DialogPreference implements OnClickLi
     }
 
     private void SetupButtonClickListeners(View view) {
-            Button mDefaultButton = (Button)view.findViewById(R.id.btnGammaDefault);
-            Button mCMButton = (Button)view.findViewById(R.id.btnGammaCM);
-            Button mBrightButton = (Button)view.findViewById(R.id.btnGammaBright);
-            mDefaultButton.setOnClickListener(this);
-            mCMButton.setOnClickListener(this);
-            mBrightButton.setOnClickListener(this);
+            Button mButton1 = (Button)view.findViewById(R.id.btnGamma1);
+            Button mButton2 = (Button)view.findViewById(R.id.btnGamma2);
+            Button mButton3 = (Button)view.findViewById(R.id.btnGamma3);
+            mButton1.setOnClickListener(this);
+            mButton2.setOnClickListener(this);
+            mButton3.setOnClickListener(this);
     }
 
     @Override
@@ -126,12 +126,13 @@ public class GammaTuningPreference extends DialogPreference implements OnClickLi
             return;
         }
 
+        int iValue;
         SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(context);
 
         Boolean bFirstTime = sharedPrefs.getBoolean("FirstTimeGamma", true);
         for (String filePath : FILE_PATH) {
             String sDefaultValue = Utils.readOneLine(filePath);
-            int iValue = sharedPrefs.getInt(filePath, Integer.valueOf(sDefaultValue));
+            iValue = sharedPrefs.getInt(filePath, Integer.valueOf(sDefaultValue));
             if (bFirstTime)
                 Utils.writeValue(filePath, "0");
             else
@@ -250,37 +251,36 @@ public class GammaTuningPreference extends DialogPreference implements OnClickLi
 
     public void onClick(View v) {
         switch(v.getId()){
-            case R.id.btnGammaDefault:
-                    SetDefaultSettings();
+            case R.id.btnGamma1:
+                    SetSettings1();
                     break;
-            case R.id.btnGammaCM:
-                    SetCMSettings();
+            case R.id.btnGamma2:
+                    SetSettings2();
                     break;
-            case R.id.btnGammaBright:
-                    SetSBrightSettings();
+            case R.id.btnGamma3:
+                    SetSettings3();
                     break;
         }
     }
 
-    private void SetCMSettings() {
+    private void SetSettings1() {
+        mSeekBars[0].SetNewValue(0);
+        mSeekBars[1].SetNewValue(0);
+        mSeekBars[2].SetNewValue(0);
+        mSeekBars[3].SetNewValue(0);
+    }
+
+    private void SetSettings2() {
         mSeekBars[0].SetNewValue(2);
         mSeekBars[1].SetNewValue(15);
         mSeekBars[2].SetNewValue(5);
         mSeekBars[3].SetNewValue(8);
     }
 
-    private void SetSBrightSettings() {
-        mSeekBars[0].SetNewValue(6);
-        mSeekBars[1].SetNewValue(25);
-        mSeekBars[2].SetNewValue(7);
-        mSeekBars[3].SetNewValue(4);
-    }
-
-    private void SetDefaultSettings() {
-        mSeekBars[0].SetNewValue(0);
+    private void SetSettings3() {
+        mSeekBars[0].SetNewValue(-4);
         mSeekBars[1].SetNewValue(0);
-        mSeekBars[2].SetNewValue(0);
+        mSeekBars[2].SetNewValue(5);
         mSeekBars[3].SetNewValue(0);
     }
-
 }