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

Commit bdd98ec2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update fonts & colors" into sc-dev

parents 2baf80f3 6974556f

res/layout/conversation_onboarding.xml

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

        android:gravity="center"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textColor="?android:attr/textColorSecondary"

        android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

        android:layout_marginTop="47dp"

        android:text="@string/conversation_onboarding_title"/>

    <TextView
@@ -41,5 +41,7 @@ 
        android:layout_height="wrap_content"

        android:gravity="center"

        android:layout_marginTop="24dp"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/textColorSecondary"

        android:text="@string/conversation_onboarding_summary"/>

</LinearLayout>

res/layout/notification_history.xml

+4 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
                android:gravity="center"

                android:focusable="true"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

                android:text="@string/notification_history_off_title_extended" />



            <TextView
@@ -74,6 +75,7 @@ 
                android:textAlignment="center"

                android:focusable="true"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textColor="?android:attr/textColorSecondary"

                android:text="@string/notification_history_off_summary" />



        </LinearLayout>
@@ -105,6 +107,7 @@ 
                android:gravity="center"

                android:focusable="true"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:fontFamily="@*android:string/config_headlineFontFamilyMedium"

                android:text="@string/history_toggled_on_title" />



            <TextView
@@ -119,6 +122,7 @@ 
                android:textAlignment="center"

                android:focusable="true"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textColor="?android:attr/textColorSecondary"

                android:text="@string/history_toggled_on_summary" />

        </LinearLayout>