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

Commit 38d29722 authored by Abhisek Devkota's avatar Abhisek Devkota Committed by Gerrit Code Review
Browse files

Merge "Settings: Add some more entries into 'SMS message limit' menu" into cm-11.0

parents 3971186b 3f9e46ef

res/values/cm_arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -448,6 +448,9 @@ 


    <!--- Sms security limit -->

    <string-array name="sms_security_check_limit_entries" translatable="false">

        <item>@string/sms_security_check_limit_none</item>

        <item>5</item>

        <item>10</item>

        <item>@string/sms_security_check_limit_default</item>

        <item>50</item>

        <item>100</item>
@@ -455,6 +458,9 @@ 
    </string-array>



    <string-array name="sms_security_check_limit_values" translatable="false">

        <item>0</item>

        <item>5</item>

        <item>10</item>

        <item>30</item>

        <item>50</item>

        <item>100</item>

res/values/cm_strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -719,7 +719,9 @@ two in order to insert additional control points. \'Remove\' deletes the selecte 
    <!-- Sms security limit -->

    <string name="sms_security_check_limit_title">SMS message limit</string>

    <string name="sms_security_check_limit_summary">Apps can send %d messages in 30 minutes before requiring confirmation</string>

    <string name="sms_security_check_limit_summary_none">Apps are not allowed to send any messages without confirmation</string>

    <string name="sms_security_check_limit_default">30 (Default)</string>

    <string name="sms_security_check_limit_none">None</string>



    <!-- Custom widgets -->

    <string name="lockscreen_custom_widgets_title">Custom widgets</string>

src/com/android/settings/SecuritySettings.java

+3 −1
Original line number Diff line number Diff line
@@ -558,7 +558,9 @@ public class SecuritySettings extends RestrictedSettingsFragment 
    }



    private void updateSmsSecuritySummary(int selection) {

        String message = getString(R.string.sms_security_check_limit_summary, selection);

        String message = selection > 0

                ? getString(R.string.sms_security_check_limit_summary, selection)

                : getString(R.string.sms_security_check_limit_summary_none);

        mSmsSecurityCheck.setSummary(message);

    }