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

Commit 01507453 authored by Eug89's avatar Eug89
Browse files

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

parents 27712a87 a747492a

res/values-ja/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -628,7 +628,9 @@ 
    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="104851667540971729">"指の軌跡を線で表示"</string>

    <string name="lockpattern_settings_enable_visible_dots_title">"ドットを表示"</string>

    <string name="lockpattern_settings_show_error_path">"失敗時に誤った軌跡を表示"</string>

    <string name="lockpattern_settings_show_custom_msg">"カスタムメッセージ表示"</string>

    <string name="lockpattern_settings_show_unlock_msg">"アンロックメッセージを表示"</string>

    <string name="lockpattern_settings_show_unlock_error_msg">"アンロックエラーメッセージを表示"</string>

    <string name="lockpattern_settings_show_custom_msg">"カスタムメッセージを表示"</string>

    <string name="lockpattern_settings_show_sliders">"スライダーを表示"</string>

    <string name="lockpattern_settings_custom_msg">"カスタムメッセージ"</string>

    <string name="lockpattern_settings_custom_msg_dialog">"カスタムメッセージを入力してください"</string>

src/com/android/settings/SecuritySettings.java

+2 −0
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ public class SecuritySettings extends PreferenceActivity { 
        mTactileFeedback.setEnabled(patternExists);

        mPinBasedLocking.setEnabled(!patternExists);

        mPinCheckTimeout.setEnabled(mLockPatternUtils.isPinLockingEnabled());

        mShowUnlockMsg.setEnabled(patternExists);

        mShowUnlockErrMsg.setEnabled(patternExists);



        mLockEnabled.setChecked(mLockPatternUtils.isLockPatternEnabled());

        mVisiblePattern.setChecked(mLockPatternUtils.isVisiblePatternEnabled());