Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 942d9b44 authored by Matthias Büchner's avatar Matthias Büchner
Browse files

Merge branch 'eclair' of git://github.com/cyanogen/android_packages_apps_Settings into eclair

parents 818e4941 597ea9a9

res/values-it/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -964,6 +964,7 @@ 
    <string name="vpn_settings_summary" msgid="8849924181594963972">"Configura e gestisci le reti private virtuali (VPN)"</string>

    <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(invariato)"</string>

    <string name="vpn_secret_not_set" msgid="1037792636371641845">"(non impostato)"</string>

    <string name="vpn_openvpn_device">Dispositivo da usare</string>

    <string name="credentials_category" msgid="8536992056377271234">"Archivio credenziali"</string>

    <string name="credentials_access" msgid="4843187230913860492">"Usa credenziali protez."</string>

    <string name="credentials_access_summary" msgid="319662078718574168">"Consenti accesso applicazioni a certificati protezione e altre credenziali"</string>

src/com/android/settings/BrightnessPreference.java

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ public class BrightnessPreference extends SeekBarPreference implements 


    public void onProgressChanged(SeekBar seekBar, int progress,

            boolean fromTouch) {

        setBrightness(progress + MINIMUM_BACKLIGHT);

        int newBrightness = progress + MINIMUM_BACKLIGHT;

        setBrightness(newBrightness > MAXIMUM_BACKLIGHT ? MAXIMUM_BACKLIGHT : newBrightness);

    }



    public void onStartTrackingTouch(SeekBar seekBar) {