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

Commit 3e6d161c authored by cketti's avatar cketti
Browse files

Show current value for the 'notification_hide_subject' ListPreference

parent 8c11ec18

res/values-de/strings.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,6 @@ http://k9mail.googlecode.com/. 
    <string name="global_settings_confirm_action_send">Senden</string>

    <string name="global_settings_confirm_action_send">Senden</string>





    <string name="global_settings_notification_hide_subject_title">Betreff in Benachrichtigungen verbergen</string>

    <string name="global_settings_notification_hide_subject_title">Betreff in Benachrichtigungen verbergen</string>

    <string name="global_settings_notification_hide_subject_summary">Verbergen des Betreffes in Benachrichtigungen</string>

    <string name="global_settings_notification_hide_subject_never">Niemals</string>

    <string name="global_settings_notification_hide_subject_never">Niemals</string>

    <string name="global_settings_notification_hide_subject_when_locked">Wenn der Bildschirm gesperrt ist</string>

    <string name="global_settings_notification_hide_subject_when_locked">Wenn der Bildschirm gesperrt ist</string>

    <string name="global_settings_notification_hide_subject_always">Immer</string>

    <string name="global_settings_notification_hide_subject_always">Immer</string>

res/values/strings.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -327,7 +327,6 @@ http://k9mail.googlecode.com/ 
    <string name="global_settings_confirm_action_send">Send</string>

    <string name="global_settings_confirm_action_send">Send</string>





    <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>

    <string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>

    <string name="global_settings_notification_hide_subject_summary">When to hide the subject in the notification bar.</string>

    <string name="global_settings_notification_hide_subject_never">Never</string>

    <string name="global_settings_notification_hide_subject_never">Never</string>

    <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>

    <string name="global_settings_notification_hide_subject_when_locked">When phone is locked</string>

    <string name="global_settings_notification_hide_subject_always">Always</string>

    <string name="global_settings_notification_hide_subject_always">Always</string>

res/xml/global_preferences.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -351,11 +351,9 @@ 
        <ListPreference

        <ListPreference

            android:persistent="false"

            android:persistent="false"

            android:key="notification_hide_subject"

            android:key="notification_hide_subject"

            android:defaultValue="NEVER"

            android:entries="@array/global_settings_notification_hide_subject_entries"

            android:entries="@array/global_settings_notification_hide_subject_entries"

            android:entryValues="@array/global_settings_notification_hide_subject_values"

            android:entryValues="@array/global_settings_notification_hide_subject_values"

            android:title="@string/global_settings_notification_hide_subject_title"

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

            android:summary="@string/global_settings_notification_hide_subject_summary"/>





    </PreferenceScreen>

    </PreferenceScreen>

src/com/fsck/k9/activity/setup/Prefs.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -217,8 +217,8 @@ public class Prefs extends K9PreferenceActivity { 
                                            K9.confirmMarkAllAsRead()

                                            K9.confirmMarkAllAsRead()

                                        });

                                        });





        mNotificationHideSubject = (ListPreference) findPreference(PREFERENCE_NOTIFICATION_HIDE_SUBJECT);

        mNotificationHideSubject = setupListPreference(PREFERENCE_NOTIFICATION_HIDE_SUBJECT,

        mNotificationHideSubject.setValue(K9.getNotificationHideSubject().toString());

                K9.getNotificationHideSubject().toString());





        mMeasureAccounts = (CheckBoxPreference)findPreference(PREFERENCE_MEASURE_ACCOUNTS);

        mMeasureAccounts = (CheckBoxPreference)findPreference(PREFERENCE_MEASURE_ACCOUNTS);

        mMeasureAccounts.setChecked(K9.measureAccounts());

        mMeasureAccounts.setChecked(K9.measureAccounts());