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

Commit c8b6b57f authored by thiasB's avatar thiasB
Browse files

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

parents 818e4941 3f9a6afa

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>

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -1385,6 +1385,8 @@ 
    <string name="lockpattern_settings_enable_visible_pattern_title">Use visible pattern</string>

    <string name="lockpattern_settings_enable_visible_dots_title">Use visible dots</string>

    <string name="lockpattern_settings_show_error_path">Show incorrect path on error</string>

    <string name="lockpattern_settings_show_unlock_msg">Show unlock message</string>

    <string name="lockpattern_settings_show_unlock_error_msg">Show unlock error messages</string>

    <string name="lockpattern_settings_show_custom_msg">Show custom message</string>

    <string name="lockpattern_settings_show_sliders">Show sliders</string>

    <string name="lockpattern_settings_custom_msg">Custom message</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) {

src/com/android/settings/SecuritySettings.java

+22 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ public class SecuritySettings extends PreferenceActivity { 
    private static final String KEY_SHOW_ERROR_PATH = "showerrorpath";

    private static final String KEY_SHOW_CUSTOM_MSG = "showcustommsg";

    private static final String KEY_SHOW_SLIDERS = "showsliders";

    private static final String KEY_SHOW_UNLOCK_MSG = "showunlockmsg";

    private static final String KEY_SHOW_UNLOCK_ERR_MSG = "showunlockerrmsg";



    private static final int CONFIRM_PATTERN_THEN_DISABLE_AND_CLEAR_REQUEST_CODE = 55;
@@ -87,6 +89,8 @@ public class SecuritySettings extends PreferenceActivity { 
    private CheckBoxPreference mShowErrorPath;

    private CheckBoxPreference mShowCustomMsg;

    private EditTextPreference mCustomMsg;

    private CheckBoxPreference mShowUnlockMsg;

    private CheckBoxPreference mShowUnlockErrMsg;

    //private CheckBoxPreference mShowSliders;

    private ListPreference mIncorrectDelay;

    private CheckBoxPreference mTactileFeedback;
@@ -196,6 +200,18 @@ public class SecuritySettings extends PreferenceActivity { 
        mShowErrorPath.setTitle(R.string.lockpattern_settings_show_error_path);

        inlinePrefCat.addPreference(mShowErrorPath);

        

        // show unlock msg        

        mShowUnlockMsg = new CheckBoxPreference(this);

        mShowUnlockMsg.setKey(KEY_SHOW_UNLOCK_MSG);

        mShowUnlockMsg.setTitle(R.string.lockpattern_settings_show_unlock_msg);

        inlinePrefCat.addPreference(mShowUnlockMsg);

        

        // show unlock error msg        

        mShowUnlockErrMsg = new CheckBoxPreference(this);

        mShowUnlockErrMsg.setKey(KEY_SHOW_UNLOCK_ERR_MSG);

        mShowUnlockErrMsg.setTitle(R.string.lockpattern_settings_show_unlock_error_msg);

        inlinePrefCat.addPreference(mShowUnlockErrMsg);



        // show custom msg

        mShowCustomMsg = new CheckBoxPreference(this);

        mShowCustomMsg.setKey(KEY_SHOW_CUSTOM_MSG);
@@ -308,6 +324,8 @@ public class SecuritySettings extends PreferenceActivity { 
        mVisibleDots.setChecked(mLockPatternUtils.isVisibleDotsEnabled());

        mShowErrorPath.setChecked(mLockPatternUtils.isShowErrorPath());

        mShowCustomMsg.setChecked(mLockPatternUtils.isShowCustomMsg());

        mShowUnlockMsg.setChecked(mLockPatternUtils.isShowUnlockMsg());

        mShowUnlockErrMsg.setChecked(mLockPatternUtils.isShowUnlockErrMsg());

        mCustomMsg.setText(mLockPatternUtils.getCustomMsg());

        //mShowSliders.setChecked(mLockPatternUtils.isShowSliders());

        mTactileFeedback.setChecked(mLockPatternUtils.isTactileFeedbackEnabled());
@@ -374,6 +392,10 @@ public class SecuritySettings extends PreferenceActivity { 
            mLockPatternUtils.setVisibleDotsEnabled(isToggled(preference));

        } else if (KEY_SHOW_ERROR_PATH.equals(key)) {

            mLockPatternUtils.setShowErrorPath(isToggled(preference));

        } else if (KEY_SHOW_UNLOCK_MSG.equals(key)) {

            mLockPatternUtils.setShowUnlockMsg(isToggled(preference));

        } else if (KEY_SHOW_UNLOCK_ERR_MSG.equals(key)) {

            mLockPatternUtils.setShowUnlockErrMsg(isToggled(preference));

        } else if (KEY_SHOW_CUSTOM_MSG.equals(key)) {

            mLockPatternUtils.setShowCustomMsg(isToggled(preference));

        } /*else if (KEY_SHOW_SLIDERS.equals(key)) {