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

Commit fa468c23 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '4871-R-Crash_on_font_preview_page' into 'v1-r' 

4871-R-Crash_on_font_preview_page

See merge request !91
parents b0e6f926 161a2672

res/layout/conversation_message_content.xml

+4 −2
Original line number Diff line number Diff line
@@ -31,13 +31,15 @@ 
            android:id="@+id/message_text"

            android:textSize="@dimen/conversation_message_text_size"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />

            android:layout_height="wrap_content"

            android:textAppearance="@style/customTitleStyle" />



        <TextView

            android:id="@+id/message_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="@dimen/conversation_status_text_size" />

            android:textSize="@dimen/conversation_status_text_size"

            android:textAppearance="@style/customBody1Style" />



    </com.android.settings.display.MessageBubbleBackground>

res/layout/conversation_message_icon.xml

+2 −1
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ 
    android:fontFamily="sans-serif"

    android:textStyle="bold"

    android:textSize="@dimen/conversation_message_contact_icon_text_size"

    android:gravity="center" />
 
    android:gravity="center"

    android:textAppearance="@style/customTitleStyle" />

res/layout/font_size_preview.xml

+4 −4
Original line number Diff line number Diff line
@@ -36,25 +36,25 @@ 
                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/font_size_preview_text_headline"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Headline"/>

                android:textAppearance="@style/customHeadlineStyle"/>



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/font_size_preview_text_title"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title"/>

                android:textAppearance="@style/customTitleStyle"/>



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/font_size_preview_text_subtitle"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"/>

                android:textAppearance="@style/customSubheadStyle"/>



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:text="@string/font_size_preview_text_body"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"/>

                android:textAppearance="@style/customBody1Style"/>

        </LinearLayout>

    </view>

</ScrollView>

res/layout/screen_zoom_activity.xml

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
                android:layout_height="wrap_content"

                android:text="@string/screen_zoom_summary"

                android:layout_marginBottom="16dp"

                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead" />

                android:textAppearance="@style/customSubheadStyle" />

        </LinearLayout>

    </LinearLayout>

</ScrollView>

res/layout/screen_zoom_preview_1.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:background="?android:attr/colorBackgroundFloating"

            android:background="@lineageos.platform:color/color_default_foreground"

            android:paddingTop="@dimen/conversation_message_list_padding"

            android:paddingStart="@dimen/conversation_message_list_padding"

            android:paddingEnd="@dimen/conversation_message_list_padding"