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

Commit c5a1bdcc authored by Veeti Paananen's avatar Veeti Paananen Committed by Michael Bestas
Browse files

Reorganize and clean up lock screen section 

- Move the option for enabling widgets to the top of the widgets header,
  as it is 1) the most important option in that section and 2) most
  likely what the user's going to be looking for first.

- Use a simple "custom widgets" title for enabling widgets instead
  of the verbose "widget pager" term.

- Shorten and simplify overly long, hard to parse space-hogging
  summaries.

- Move "slider shortcuts" out of the widgets section.

Change-Id: Iac1b55a6b976c5645ca7f46e7fdf0821396e1100
parent 0169a577

res/values/cm_strings.xml

+5 −4
Original line number Diff line number Diff line
@@ -232,9 +232,7 @@ 
    <!-- Lock screen widgets -->

    <string name="lockscreen_widgets_category_title">Widgets</string>

    <string name="lockscreen_maximize_widgets_title">Maximize widgets</string>

    <string name="lockscreen_maximize_widgets_summary">Show widgets maximized and the unlock minimized when the screen is turned on</string>

    <string name="lockscreen_enable_widgets_title">Widget pager</string>

    <string name="lockscreen_enable_widgets_summary">Allow multiple widget pages to be added and selected</string>

    <string name="lockscreen_maximize_widgets_summary">Expand widgets when the screen is turned on</string>



    <!-- Safe headset volume restore checkbox -->

    <string name="safe_headset_volume_title">Safe headset volume</string>
@@ -652,9 +650,12 @@ two in order to insert additional control points. \'Remove\' deletes the selecte 
    <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_default">30 (Default)</string>



    <!-- Custom widgets -->

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



    <!--- Lock clock -->

    <string name="lock_clock_title">Clock widget</string>

    <string name="lock_clock_summary">View or change how the \'cLock\' Home and Lock screen widgets will display</string>

    <string name="lock_clock_summary">Customize the default Lock and Home screen widget</string>



    <!-- Category title for Charging sounds (Power state change) specific Settings.

         [CHAR LIMIT=40] -->

res/xml/lockscreen_interface_settings.xml

+15 −15
Original line number Diff line number Diff line
@@ -17,16 +17,20 @@ 
    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:title="@string/themes_settings_title" >



    <PreferenceCategory

        android:title="@string/lockscreen_widgets_category_title"

        android:key="lockscreen_widgets_category" >



    <Preference

        android:fragment="com.android.settings.cyanogenmod.LockscreenTargets"

        android:key="lockscreen_targets"

        android:summary="@string/lockscreen_target_summary"

        android:title="@string/lockscreen_target_title" />



    <PreferenceCategory

        android:title="@string/lockscreen_widgets_category_title"

        android:key="lockscreen_widgets_category" >



        <CheckBoxPreference

            android:key="keyguard_enable_widgets"

            android:title="@string/lockscreen_custom_widgets_title" />



        <!-- Lock clock -->

        <PreferenceScreen

            android:key="lock_clock"
@@ -42,9 +46,5 @@ 
            android:summary="@string/lockscreen_maximize_widgets_summary"

            android:title="@string/lockscreen_maximize_widgets_title" />



        <CheckBoxPreference

            android:key="keyguard_enable_widgets"

            android:title="@string/lockscreen_enable_widgets_title" />



    </PreferenceCategory>

</PreferenceScreen>

src/com/android/settings/cyanogenmod/LockscreenInterface.java

+0 −2
Original line number Diff line number Diff line
@@ -94,8 +94,6 @@ public class LockscreenInterface extends SettingsPreferenceFragment { 
                if (disabled) {

                    mEnableKeyguardWidgets.setSummary(

                            R.string.security_enable_widgets_disabled_summary);

                } else {

                    mEnableKeyguardWidgets.setSummary(R.string.lockscreen_enable_widgets_summary);

                }

                mEnableKeyguardWidgets.setEnabled(!disabled);

            }