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

Commit 353bf34b authored by Zemiao Zhu's avatar Zemiao Zhu Committed by Android Build Coastguard Worker
Browse files

Remove all TextAppearance.DeviceDefault. 

Replace with TextAppearance.Material + fontFamily. Theoretically they
should be the same based on definitions in
frameworks/base/core/res/res/values/styles_device_defaults.xml, but
DeviceDefault is a hidden resource and seems to be causing OEM Tablet
devices abnormal font size.

Bug: 193076607
Test: manual
Change-Id: I78b568fe062eaba050db9b2815aaacd6f7e2a911
(cherry picked from commit 6004ed96)
parent e8073383

res/layout-sw720dp/item_doc_list.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -110,7 +110,7 @@ 
                    android:ellipsize="middle"

                    android:ellipsize="middle"

                    android:singleLine="true"

                    android:singleLine="true"

                    android:textAlignment="viewStart"

                    android:textAlignment="viewStart"

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

                    android:textAppearance="@style/Subhead"

                    android:textColor="?android:attr/textColorPrimary"/>

                    android:textColor="?android:attr/textColorPrimary"/>

            </LinearLayout>

            </LinearLayout>
@@ -123,7 +123,7 @@ 
                android:ellipsize="end"

                android:ellipsize="end"

                android:singleLine="true"

                android:singleLine="true"

                android:textAlignment="viewStart"

                android:textAlignment="viewStart"

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

                android:textAppearance="@style/Body1"

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

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





            <TextView

            <TextView
@@ -136,7 +136,7 @@ 
                android:minWidth="70dp"

                android:minWidth="70dp"

                android:singleLine="true"

                android:singleLine="true"

                android:textAlignment="viewEnd"

                android:textAlignment="viewEnd"

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

                android:textAppearance="@style/Body1"

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

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





            <TextView

            <TextView
@@ -149,7 +149,7 @@ 
                android:minWidth="70dp"

                android:minWidth="70dp"

                android:singleLine="true"

                android:singleLine="true"

                android:textAlignment="viewEnd"

                android:textAlignment="viewEnd"

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

                android:textAppearance="@style/Body1"

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

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

        </LinearLayout>

        </LinearLayout>

res/layout-sw720dp/shared_cell_content.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
        android:ellipsize="end"

        android:ellipsize="end"

        android:singleLine="true"

        android:singleLine="true"

        android:textAlignment="viewStart"

        android:textAlignment="viewStart"

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

        android:textAppearance="@style/Subhead"

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

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





    <ImageView

    <ImageView

res/layout/dialog_delete_confirmation.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,5 +21,5 @@ 
    android:paddingTop="24dp"

    android:paddingTop="24dp"

    android:paddingStart="24dp"

    android:paddingStart="24dp"

    android:paddingEnd="24dp"

    android:paddingEnd="24dp"

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

    android:textAppearance="@style/Subhead">

</TextView>
 
</TextView>

res/layout/drag_shadow_layout.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ 
            android:maxLines="1"

            android:maxLines="1"

            android:ellipsize="end"

            android:ellipsize="end"

            android:textAlignment="viewStart"

            android:textAlignment="viewStart"

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

            android:textAppearance="@style/Subhead"

            android:paddingStart="6dp"

            android:paddingStart="6dp"

            android:paddingBottom="1dp"/>

            android:paddingBottom="1dp"/>

res/values-v31/styles.xml

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

  -->





<resources>

<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="android:textColor">?android:attr/textColorPrimary</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

        <item name="fontFamily">@string/config_fontFamilyMedium</item>

        <item name="android:textSize">12sp</item>

        <item name="android:textSize">12sp</item>