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

Unverified Commit 45788631 authored by Wiktor Kwapisiewicz's avatar Wiktor Kwapisiewicz
Browse files

Convert PreferenceScreens to Categories 

Nested PreferenceScreens do not get the AppCompat Action Bar.
Converting them to categories works-around the issue.

Resolves #3753.
parent 3caa56a5

app/ui/src/main/res/xml/font_preferences.xml

+10 −13
Original line number Original line Diff line number Diff line
@@ -4,14 +4,11 @@ 
  Make sure to add android:persistent="false" to all preferences to disable saving

  Make sure to add android:persistent="false" to all preferences to disable saving

  the preference values to SharedPreferences. We use our own storage mechanism for

  the preference values to SharedPreferences. We use our own storage mechanism for

  the preferences. See com.fsck.k9.preferences.Storage.

  the preferences. See com.fsck.k9.preferences.Storage.



  Also note that every sub-PreferenceScreen needs an "android:key" parameter so the correct screen

  can be displayed after the device has been rotated.

-->

-->





<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">





    <PreferenceScreen

    <PreferenceCategory

        android:title="@string/font_size_account_list"

        android:title="@string/font_size_account_list"

        android:key="account_list_fonts">

        android:key="account_list_fonts">
@@ -31,9 +28,9 @@ 
            android:entryValues="@array/font_values"

            android:entryValues="@array/font_values"

            android:dialogTitle="@string/font_size_account_description" />

            android:dialogTitle="@string/font_size_account_description" />





    </PreferenceScreen>

    </PreferenceCategory>





    <PreferenceScreen

    <PreferenceCategory

        android:title="@string/font_size_folder_list"

        android:title="@string/font_size_folder_list"

        android:key="folder_list_fonts">

        android:key="folder_list_fonts">
@@ -53,9 +50,9 @@ 
            android:entryValues="@array/font_values"

            android:entryValues="@array/font_values"

            android:dialogTitle="@string/font_size_folder_status" />

            android:dialogTitle="@string/font_size_folder_status" />





    </PreferenceScreen>

    </PreferenceCategory>





    <PreferenceScreen

    <PreferenceCategory

        android:title="@string/font_size_message_list"

        android:title="@string/font_size_message_list"

        android:key="message_list_fonts">

        android:key="message_list_fonts">
@@ -91,9 +88,9 @@ 
            android:entryValues="@array/font_values"

            android:entryValues="@array/font_values"

            android:dialogTitle="@string/font_size_message_list_preview" />

            android:dialogTitle="@string/font_size_message_list_preview" />





    </PreferenceScreen>

    </PreferenceCategory>





    <PreferenceScreen

    <PreferenceCategory

        android:title="@string/font_size_message_view"

        android:title="@string/font_size_message_view"

        android:key="message_view_fonts">

        android:key="message_view_fonts">
@@ -159,9 +156,9 @@ 
            android:title="@string/font_size_message_view_content"

            android:title="@string/font_size_message_view_content"

            android:dialogTitle="@string/font_size_message_view_content" />

            android:dialogTitle="@string/font_size_message_view_content" />





    </PreferenceScreen>

    </PreferenceCategory>





    <PreferenceScreen

    <PreferenceCategory

        android:title="@string/font_size_message_compose"

        android:title="@string/font_size_message_compose"

        android:key="message_compose_fonts">

        android:key="message_compose_fonts">
@@ -173,6 +170,6 @@ 
            android:entryValues="@array/font_values"

            android:entryValues="@array/font_values"

            android:dialogTitle="@string/font_size_message_compose_input" />

            android:dialogTitle="@string/font_size_message_compose_input" />





    </PreferenceScreen>

    </PreferenceCategory>





</PreferenceScreen>
 
</PreferenceScreen>