diff options
Diffstat (limited to 'GNexusParts')
16 files changed, 290 insertions, 197 deletions
diff --git a/GNexusParts/res/layout/preference_colorgamma_presets.xml b/GNexusParts/res/layout/preference_colorgamma_presets.xml index bd50287..af85740 100755 --- a/GNexusParts/res/layout/preference_colorgamma_presets.xml +++ b/GNexusParts/res/layout/preference_colorgamma_presets.xml @@ -49,70 +49,84 @@ android:src="@drawable/blue_tuning_preview" /> <LinearLayout - android:layout_width="wrap_content" + android:id="@+id/linearLayout1" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_weight="1" android:layout_below="@+id/imageView0" - android:orientation="vertical" > + android:gravity="center_horizontal" > - <LinearLayout - android:layout_width="match_parent" + <Button + android:id="@+id/btnPreset1" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" > - - <Button - android:id="@+id/btnPreset1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/preset1_default_title" android:textSize="10dp" android:width="100dp"/> - - <Button - android:id="@+id/btnPreset2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/preset2_default_title" android:textSize="10dp" android:width="100dp"/> - - <Button - android:id="@+id/btnPreset3" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/preset3_default_title" android:textSize="10dp" android:width="100dp"/> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <Button - android:id="@+id/btnPreset4" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/preset4_default_title" android:textSize="10dp" android:width="100dp"/> - - <Button - android:id="@+id/btnPreset5" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/preset5_default_title" android:textSize="10dp" android:width="100dp"/> - - <Button - android:id="@+id/btnPreset6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/preset6_default_title" android:textSize="10dp" android:width="100dp"/> - </LinearLayout> - - <LinearLayout - android:layout_width="320dp" + android:text="@string/preset1_default_title" + android:textSize="12dp" + android:width="100dp"/> + + <Button + android:id="@+id/btnPreset2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/preset2_default_title" + android:textSize="12dp" + android:width="100dp"/> + + <Button + android:id="@+id/btnPreset3" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" > + android:text="@string/preset3_default_title" + android:textSize="12dp" + android:width="100dp"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/linearLayout2" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/linearLayout1" + android:gravity="center_horizontal" > - <TextView - android:id="@+id/textView1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/credits_presets" android:textSize="12dp"/> + <Button + android:id="@+id/btnPreset4" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/preset4_default_title" + android:textSize="12dp" + android:width="100dp"/> + + <Button + android:id="@+id/btnPreset5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/preset5_default_title" + android:textSize="12dp" + android:width="100dp"/> + + <Button + android:id="@+id/btnPreset6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/preset6_default_title" + android:textSize="12dp" + android:width="100dp"/> + </LinearLayout> + + <LinearLayout + android:layout_width="320dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_below="@+id/linearLayout2" > + + <TextView + android:id="@+id/textView1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:text="@string/credits_presets" + android:textSize="12dp"/> - </LinearLayout> </LinearLayout> </RelativeLayout> diff --git a/GNexusParts/res/layout/preference_dialog_color_tuning.xml b/GNexusParts/res/layout/preference_dialog_color_tuning.xml index 068f88c..51883d1 100644 --- a/GNexusParts/res/layout/preference_dialog_color_tuning.xml +++ b/GNexusParts/res/layout/preference_dialog_color_tuning.xml @@ -93,25 +93,48 @@ android:id="@+id/linearLayout1" android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center_horizontal" android:layout_below="@+id/black_scale_picture_color" > <Button - android:id="@+id/btnColorDefault" + android:id="@+id/btnColor1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/color_default_title" /> + android:text="@string/color1_title" + android:textSize="12dp" + android:width="100dp"/> <Button - android:id="@+id/btnColorCM" + android:id="@+id/btnColor2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/color_CM_title" /> + android:text="@string/color2_title" + android:textSize="12dp" + android:width="100dp"/> <Button - android:id="@+id/btnColorDark" + android:id="@+id/btnColor3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/color_dark_title" /> + android:text="@string/color3_title" + android:textSize="12dp" + android:width="100dp"/> + + </LinearLayout> + + <LinearLayout + android:layout_width="320dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_below="@+id/linearLayout1"> + + <TextView + android:id="@+id/textView1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="10dip" + android:text="@string/color_warning" + android:textSize="12dp"/> </LinearLayout> diff --git a/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml b/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml index 8df2204..c18682f 100644 --- a/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml +++ b/GNexusParts/res/layout/preference_dialog_gamma_tuning.xml @@ -117,25 +117,32 @@ android:id="@+id/linearLayout1" android:layout_width="match_parent" android:layout_height="wrap_content" + android:gravity="center_horizontal" android:layout_below="@+id/black_scale_picture" > <Button - android:id="@+id/btnGammaDefault" + android:id="@+id/btnGamma1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/gamma_default_title" /> + android:text="@string/gamma1_title" + android:textSize="12dp" + android:width="100dp"/> <Button - android:id="@+id/btnGammaCM" + android:id="@+id/btnGamma2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/gamma_CM_title" /> + android:text="@string/gamma2_title" + android:textSize="12dp" + android:width="100dp"/> <Button - android:id="@+id/btnGammaBright" + android:id="@+id/btnGamma3" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/gamma_bright_title" /> + android:text="@string/gamma3_title" + android:textSize="12dp" + android:width="100dp"/> </LinearLayout> diff --git a/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml b/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml index 2b6e077..4b7d6ba 100644 --- a/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml +++ b/GNexusParts/res/layout/preference_dialog_vibrator_tuning.xml @@ -44,6 +44,12 @@ android:layout_height="wrap_content" android:text="@string/vibrator_default_title" /> + <Button + android:id="@+id/btnvibratorTest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/vibrator_test_title" /> + </LinearLayout> </RelativeLayout> diff --git a/GNexusParts/res/values-de/strings.xml b/GNexusParts/res/values-de/strings.xml index 0c73fde..af6da0c 100644 --- a/GNexusParts/res/values-de/strings.xml +++ b/GNexusParts/res/values-de/strings.xml @@ -17,20 +17,20 @@ <string name="color_red_title">Rot</string> <string name="color_green_title">Grün</string> <string name="color_blue_title">Blau</string> - <string name="gamma_default_title">Standard</string> - <string name="gamma_CM_title">CM</string> - <string name="gamma_bright_title">Hell</string> - <string name="color_default_title">Standard</string> - <string name="color_CM_title">CM</string> - <string name="color_dark_title">Dunkel</string> + <string name="gamma1_title">Standard</string> + <string name="gamma2_title">CM</string> + <string name="gamma3_title">Natural</string> + <string name="color1_title">Standard</string> + <string name="color2_title">CM</string> + <string name="color3_title">Natural</string> <string name="gamma_dss_title">DSS Gammawert</string> <string name="preset1_default_title">Standard</string> - <string name="preset2_default_title">Natürlich</string> - <string name="preset3_default_title">Dunkles Blau</string> + <string name="preset2_default_title">Maximal</string> + <string name="preset3_default_title">Real</string> <string name="preset4_default_title">Warm</string> <string name="preset5_default_title">Kalt</string> - <string name="preset6_default_title">X-Processing</string> + <string name="preset6_default_title">Natürlich</string> <string name="credits_presets">Dank an: ale.landra91 cpaixao provolinoo</string> <string name="category_radio_title">Mobilfunk</string> diff --git a/GNexusParts/res/values-es/strings.xml b/GNexusParts/res/values-es/strings.xml index bd0d454..b7efdef 100644 --- a/GNexusParts/res/values-es/strings.xml +++ b/GNexusParts/res/values-es/strings.xml @@ -17,12 +17,13 @@ <string name="color_red_title">Rojo</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <string name="gamma_default_title">Predet.</string> - <string name="gamma_CM_title">CyanogenMod</string> - <string name="gamma_bright_title">Claro</string> - <string name="color_default_title">Predet.</string> - <string name="color_CM_title">CyanogenMod</string> - <string name="color_dark_title">Oscuro</string> + <string name="gamma1_title">Predet.</string> + <string name="gamma2_title">Cyanogen</string> + <string name="gamma3_title">Natural</string> + <string name="color1_title">Predet.</string> + <string name="color2_title">Cyanogen</string> + <string name="color3_title">Natural</string> + <string name="color_warning">No son recomendables valores mayores de 200</string> <string name="gamma_dss_title">Gamma DSS</string> <string name="category_hardware_title">CPU</string> @@ -33,12 +34,12 @@ <string name="vibrator_default_title">Predet.</string> <string name="preset1_default_title">Predet.</string> - <string name="preset2_default_title">Natural</string> - <string name="preset3_default_title">Azul</string> + <string name="preset2_default_title">Máximo</string> + <string name="preset3_default_title">Real</string> <string name="preset4_default_title">Cálido</string> <string name="preset5_default_title">Frío</string> - <string name="preset6_default_title">Cruzado</string> - <string name="credits_presets">Créditos: ale.landra91 cpaixao provolinoo</string> + <string name="preset6_default_title">Natural</string> + <string name="credits_presets">Créditos: ale.landra91, cpaixao, provolinoo</string> <string name="category_touchkey_title">Teclas táctiles</string> <string name="touchkey_notification_title_head">Notificaciones luminosas</string> diff --git a/GNexusParts/res/values-pt/strings.xml b/GNexusParts/res/values-pt/strings.xml index a189ad9..0ccff92 100755 --- a/GNexusParts/res/values-pt/strings.xml +++ b/GNexusParts/res/values-pt/strings.xml @@ -14,24 +14,25 @@ <string name="color_red_title">Vermelho</string> <string name="color_green_title">Verde</string> <string name="color_blue_title">Azul</string> - <string name="gamma_default_title">Padrão</string> - <string name="gamma_CM_title">Conf. CM</string> - <string name="gamma_bright_title">Conf. de Brilho</string> - <string name="color_default_title">Padrão</string> - <string name="color_CM_title">Conf. CM</string> - <string name="color_dark_title">Conf. Escuro</string> + <string name="gamma1_title">Padrão</string> + <string name="gamma2_title">Conf. CM</string> + <string name="gamma3_title">Natural</string> + <string name="color1_title">Padrão</string> + <string name="color2_title">Conf. CM</string> + <string name="color3_title">Natural</string> + <string name="color_warning">Dos valores recomendados não são maiores do que 200</string> <string name="gamma_dss_title">Conf. DSS Gama</string> <string name="preset1_default_title">Padrão.</string> - <string name="preset2_default_title">Natural</string> - <string name="preset3_default_title">Azul Escuro</string> + <string name="preset2_default_title">Máximo</string> + <string name="preset3_default_title">Real</string> <string name="preset4_default_title">Quente</string> - <string name="preset5_default_title">Frio Escuro</string> - <string name="preset6_default_title">Cross Proc.</string> - <string name="credits_presets">Créditos: ale.landra91 cpaixao provolinoo</string> + <string name="preset5_default_title">Frio</string> + <string name="preset6_default_title">Natural</string> + <string name="credits_presets">Créditos: ale.landra91, cpaixao, provolinoo</string> <string name="category_touchkey_title">Teclas sensíveis ao toque</string> <string name="touchkey_notification_title_head">Notificações de luz de fundo</string> <string name="touchkey_notification_summary_head">A luz de fundo das teclas irão acender quando haver uma notificação.</string> <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> <string name="hspa_summary_head">Ativar HSDPA/HSUPA</string> -</resources>
\ No newline at end of file +</resources> diff --git a/GNexusParts/res/values-ru/strings.xml b/GNexusParts/res/values-ru/strings.xml index 4d1b08d..00aeab3 100644 --- a/GNexusParts/res/values-ru/strings.xml +++ b/GNexusParts/res/values-ru/strings.xml @@ -17,12 +17,13 @@ <string name="color_red_title">Красный</string> <string name="color_green_title">Зелёный</string> <string name="color_blue_title">Синий</string> - <string name="gamma_default_title">По умолч.</string> - <string name="gamma_CM_title">Настр. CM</string> - <string name="gamma_bright_title">Ярко</string> - <string name="color_default_title">По умолч.</string> - <string name="color_CM_title">Настр. CM</string> - <string name="color_dark_title">Темно</string> + <string name="gamma1_title">По умолч.</string> + <string name="gamma2_title">Настр. CM</string> + <string name="gamma3_title">Натуральный</string> + <string name="color1_title">По умолч.</string> + <string name="color2_title">Настр. CM</string> + <string name="color3_title">Натуральный</string> + <string name="color_warning">Установка значений выше 200 не рекомендуется</string> <string name="gamma_dss_title">Настр. DSS гаммы</string> <string name="category_hardware_title">ЦП</string> @@ -33,12 +34,12 @@ <string name="vibrator_default_title">По умолчанию</string> <string name="preset1_default_title">По умолчанию</string> - <string name="preset2_default_title">Естественный</string> - <string name="preset3_default_title">Тёмно-синий</string> + <string name="preset2_default_title">Mаксимальный</string> + <string name="preset3_default_title">Pеальный</string> <string name="preset4_default_title">Тёплый</string> <string name="preset5_default_title">Хол. тёмный</string> - <string name="preset6_default_title">Перекр. обраб.</string> - <string name="credits_presets">Участники: ale.landra91 cpaixao provolinoo</string> + <string name="preset6_default_title">Натуральный</string> + <string name="credits_presets">Участники: ale.landra91, cpaixao, provolinoo</string> <string name="category_touchkey_title">Сенсорные копки</string> <string name="touchkey_notification_title_head">Подсветка уведомлений</string> diff --git a/GNexusParts/res/values/strings.xml b/GNexusParts/res/values/strings.xml index 01902a5..1d0f046 100644 --- a/GNexusParts/res/values/strings.xml +++ b/GNexusParts/res/values/strings.xml @@ -17,12 +17,13 @@ <string name="color_red_title">Red</string> <string name="color_green_title">Green</string> <string name="color_blue_title">Blue</string> - <string name="gamma_default_title">Default</string> - <string name="gamma_CM_title">CM Sett.</string> - <string name="gamma_bright_title">Bright Sett.</string> - <string name="color_default_title">Default</string> - <string name="color_CM_title">CM Sett.</string> - <string name="color_dark_title">Dark Sett.</string> + <string name="gamma1_title">Default</string> + <string name="gamma2_title">CM Sett.</string> + <string name="gamma3_title">Natural</string> + <string name="color1_title">Default</string> + <string name="color2_title">CM Sett.</string> + <string name="color3_title">Natural</string> + <string name="color_warning">Values higher than 200 are not recommended</string> <string name="gamma_dss_title">DSS Gamma Set.</string> <string name="category_hardware_title">CPU</string> @@ -31,18 +32,19 @@ <string name="vibrator_title">Vibration %</string> <string name="vibrator_default_title">Default</string> + <string name="vibrator_test_title">Test</string> - <string name="preset1_default_title">Default.</string> - <string name="preset2_default_title">Natural</string> - <string name="preset3_default_title">Dark Blue</string> + <string name="preset1_default_title">Default</string> + <string name="preset2_default_title">Maximum</string> + <string name="preset3_default_title">Real</string> <string name="preset4_default_title">Warm</string> <string name="preset5_default_title">Dark Cold</string> - <string name="preset6_default_title">Cross Proc.</string> - <string name="credits_presets">Credits: ale.landra91 cpaixao provolinoo</string> + <string name="preset6_default_title">Natural</string> + <string name="credits_presets">Credits: ale.landra91, cpaixao, provolinoo</string> <string name="category_touchkey_title">Touch Keys</string> <string name="touchkey_notification_title_head">Backlight Notifications</string> - <string name="touchkey_notification_summary_head">The touch key backlights will turn on when there is a notification.</string> + <string name="touchkey_notification_summary_head">The touch key backlights will turn on when there is a notification</string> <string name="category_radio_title">Radio</string> <string name="hspa_title_head">HSPA</string> diff --git a/GNexusParts/res/xml/display_preferences.xml b/GNexusParts/res/xml/display_preferences.xml index 45795d1..9fea40f 100755 --- a/GNexusParts/res/xml/display_preferences.xml +++ b/GNexusParts/res/xml/display_preferences.xml @@ -12,7 +12,7 @@ android:title="@string/gamma_tuning_title_head" android:summary="@string/gamma_tuning_summary_head" /> <com.cyanogenmod.settings.device.ColorHackPresets - android:key="color_presets" + android:key="colorgamma_presets" android:title="@string/color_hack_presets_title_head" android:summary="@string/color_hack_presets_summary_head" /> 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..61b9114 100644 --- a/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ b/GNexusParts/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -32,6 +32,7 @@ import android.os.IBinder; import android.support.v13.app.FragmentPagerAdapter; import android.support.v4.app.FragmentActivity; import android.support.v4.view.ViewPager; +import android.view.MenuItem; import com.cyanogenmod.settings.device.R; @@ -43,6 +44,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"; @@ -63,6 +65,7 @@ public class DeviceSettings extends Activity { bar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); bar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE, ActionBar.DISPLAY_SHOW_TITLE); bar.setTitle(R.string.app_name); + bar.setDisplayHomeAsUpEnabled(true); mTabsAdapter = new TabsAdapter(this, mViewPager); mTabsAdapter.addTab(bar.newTab().setText(R.string.display_title), @@ -160,4 +163,14 @@ public class DeviceSettings extends Activity { public void onTabReselected(Tab tab, FragmentTransaction ft) { } } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + DeviceSettings.this.onBackPressed(); + default: + return super.onOptionsItemSelected(item); + } + } } 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); } - } diff --git a/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java b/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java index af2824c..bad754c 100644 --- a/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java +++ b/GNexusParts/src/com/cyanogenmod/settings/device/VibratorTuningPreference.java @@ -28,6 +28,7 @@ import android.widget.SeekBar; import android.widget.TextView; import android.widget.Button; import android.util.Log; +import android.os.Vibrator; /** * Special preference type that allows configuration of both the ring volume and @@ -86,6 +87,9 @@ public class VibratorTuningPreference extends DialogPreference implements OnClic private void SetupButtonClickListeners(View view) { Button mDefaultButton = (Button)view.findViewById(R.id.btnvibratorDefault); mDefaultButton.setOnClickListener(this); + + Button mTestButton = (Button)view.findViewById(R.id.btnvibratorTest); + mTestButton.setOnClickListener(this); } @Override @@ -256,6 +260,9 @@ public class VibratorTuningPreference extends DialogPreference implements OnClic case R.id.btnvibratorDefault: setDefaultSettings(); break; + case R.id.btnvibratorTest: + testVibration(); + break; } } @@ -263,4 +270,8 @@ public class VibratorTuningPreference extends DialogPreference implements OnClic mSeekBars[0].setNewValue(100); } + private void testVibration() { + Vibrator vib = (Vibrator) this.getContext().getSystemService(Context.VIBRATOR_SERVICE); + vib.vibrate(1000); + } } |