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

Commit c4f08010 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [15308469] into sparse-7502182-L70000000950343899

Change-Id: I5cd592269ecc7c4e5124c651faa3f0e4cfe08d58
parents e8073383 353bf34b
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@
                    android:ellipsize="middle"
                    android:singleLine="true"
                    android:textAlignment="viewStart"
                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
                    android:textAppearance="@style/Subhead"
                    android:textColor="?android:attr/textColorPrimary"/>
            </LinearLayout>

@@ -123,7 +123,7 @@
                android:ellipsize="end"
                android:singleLine="true"
                android:textAlignment="viewStart"
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                android:textAppearance="@style/Body1"
                android:textColor="?android:attr/textColorSecondary" />

            <TextView
@@ -136,7 +136,7 @@
                android:minWidth="70dp"
                android:singleLine="true"
                android:textAlignment="viewEnd"
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                android:textAppearance="@style/Body1"
                android:textColor="?android:attr/textColorSecondary" />

            <TextView
@@ -149,7 +149,7 @@
                android:minWidth="70dp"
                android:singleLine="true"
                android:textAlignment="viewEnd"
                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                android:textAppearance="@style/Body1"
                android:textColor="?android:attr/textColorSecondary" />
        </LinearLayout>

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
        android:ellipsize="end"
        android:singleLine="true"
        android:textAlignment="viewStart"
        android:textAppearance="@*style/android:TextAppearance.DeviceDefault.Subhead"
        android:textAppearance="@style/Subhead"
        android:textColor="?android:attr/textColorSecondary"/>

    <ImageView
+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@
    android:paddingTop="24dp"
    android:paddingStart="24dp"
    android:paddingEnd="24dp"
    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead">
    android:textAppearance="@style/Subhead">
</TextView>
+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@
            android:maxLines="1"
            android:ellipsize="end"
            android:textAlignment="viewStart"
            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
            android:textAppearance="@style/Subhead"
            android:paddingStart="6dp"
            android:paddingBottom="1dp"/>

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@
  -->

<resources>
    <style name="SectionHeader" parent="@*android:style/TextAppearance.DeviceDefault.Medium">
    <style name="SectionHeader" parent="@android:style/TextAppearance.Material.Medium">
        <item name="android:textColor">?android:attr/textColorPrimary</item>
        <item name="fontFamily">@string/config_fontFamilyMedium</item>
        <item name="android:textSize">12sp</item>
Loading