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

Commit 99472ce2 authored by cketti's avatar cketti Committed by GitHub
Browse files

Merge pull request #2226 from RobinBossart/issue_2213 

Make all keys in global_preferences.xml lowercase
parents 8ee9b2c5 82b6f457

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

+3 −3
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ public class Prefs extends K9PreferenceActivity { 
    private static final String PREFERENCE_LANGUAGE = "language";

    private static final String PREFERENCE_THEME = "theme";

    private static final String PREFERENCE_MESSAGE_VIEW_THEME = "messageViewTheme";

    private static final String PREFERENCE_FIXED_MESSAGE_THEME = "fixedMessageViewTheme";

    private static final String PREFERENCE_COMPOSER_THEME = "messageComposeTheme";

    private static final String PREFERENCE_FIXED_MESSAGE_THEME = "fixed_message_view_theme";

    private static final String PREFERENCE_COMPOSER_THEME = "message_compose_theme";

    private static final String PREFERENCE_FONT_SIZE = "font_size";

    private static final String PREFERENCE_ANIMATIONS = "animations";

    private static final String PREFERENCE_GESTURES = "gestures";

    private static final String PREFERENCE_VOLUME_NAVIGATION = "volumeNavigation";

    private static final String PREFERENCE_VOLUME_NAVIGATION = "volume_navigation";

    private static final String PREFERENCE_START_INTEGRATED_INBOX = "start_integrated_inbox";

    private static final String PREFERENCE_CONFIRM_ACTIONS = "confirm_actions";

    private static final String PREFERENCE_NOTIFICATION_HIDE_SUBJECT = "notification_hide_subject";

k9mail/src/main/res/xml/global_preferences.xml

+4 −4
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ 


            <CheckBoxPreference

                android:persistent="false"

                android:key="fixedMessageViewTheme"

                android:key="fixed_message_view_theme"

                android:title="@string/settings_message_theme_selection_label"

                android:summaryOff="@string/settings_message_theme_selection_summary_off"

                android:summaryOn="@string/settings_message_theme_selection_summary_on" />



            <ListPreference

                android:persistent="false"

                android:dependency="fixedMessageViewTheme"

                android:dependency="fixed_message_view_theme"

                android:key="messageViewTheme"

                android:title="@string/settings_message_theme_label"

                android:entries="@array/settings_message_theme_entries"
@@ -67,7 +67,7 @@ 


            <ListPreference

                android:persistent="false"

                android:key="messageComposeTheme"

                android:key="message_compose_theme"

                android:title="@string/settings_compose_theme_label"

                android:entries="@array/settings_message_theme_entries"

                android:entryValues="@array/settings_message_theme_values"
@@ -264,7 +264,7 @@ 


        <com.fsck.k9.preferences.CheckBoxListPreference

            android:persistent="false"

            android:key="volumeNavigation"

            android:key="volume_navigation"

            android:title="@string/volume_navigation_title"

            android:dialogTitle="@string/volume_navigation_title"

            android:positiveButtonText="@android:string/ok"