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

Commit a5e8bddc authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Update Settings text styles to use DeviceDefault. 

- Replace all TextAppearance.Material styles with the equivalent
TextAppearance.DeviceDefault style
- Reparent Theme.Settings.HomeBase to inherit from Theme.Settings. This
ensures that the correct textAppearance theme attributes are applied
throughout the Settings application.

Bug: 121211932
Test: manually opening Settings and enabling/disabling HotDogOverlay
Change-Id: Ibe4873ed0294de79dbb6aeca464d14c291239c4b
parent 221b7e0b

res/layout-land/confirm_lock_password.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:layout_height="match_parent">



        <TextView

            style="@android:style/TextAppearance.Material.Title"

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

            android:id="@+id/headerText"

            android:layout_marginStart="24dp"

            android:layout_marginEnd="24dp"
@@ -38,7 +38,7 @@ 
            android:textColor="?android:attr/colorAccent"/>



        <TextView

            style="@android:style/TextAppearance.Material.Body1"

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

            android:id="@+id/detailsText"

            android:layout_marginStart="24dp"

            android:layout_marginEnd="24dp"

res/layout-land/confirm_lock_pattern.xml

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
            android:orientation="vertical">



            <TextView

                style="@android:style/TextAppearance.Material.Headline"

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

                android:id="@+id/headerText"

                android:layout_marginStart="32dp"

                android:layout_marginEnd="32dp"
@@ -46,7 +46,7 @@ 
                android:textColor="?android:attr/colorAccent"/>



            <TextView

                style="@android:style/TextAppearance.Material.Body1"

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

                android:id="@+id/detailsText"

                android:layout_marginStart="32dp"

                android:layout_marginEnd="32dp"

res/layout-land/storage_summary_donut.xml

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
            android:fontFamily="@*android:string/config_headlineFontFamily"

            android:singleLine="true"

            android:textAlignment="viewStart"

            android:textAppearance="@android:style/TextAppearance.Material.Display1"

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

            android:textSize="36sp" />



        <TextView
@@ -54,7 +54,7 @@ 
            android:maxLines="10"

            android:paddingBottom="20dp"

            android:textAlignment="viewStart"

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

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



        <Button

            android:id="@+id/deletion_helper_button"

res/layout-sw300dp-land/font_size_activity.xml

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

                android:layout_gravity="center_horizontal"

                android:padding="6dp"

                android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"

                android:elevation="2dp" />



            <com.android.settings.widget.LabeledSeekBar
@@ -102,7 +102,7 @@ 
                android:layout_height="wrap_content"

                android:text="@string/font_size_summary"

                android:layout_marginBottom="16dp"

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

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

        </LinearLayout>

    </ScrollView>

</LinearLayout>

res/layout-sw300dp-land/screen_zoom_activity.xml

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

                android:layout_gravity="center_horizontal"

                android:padding="6dp"

                android:textAppearance="@android:style/TextAppearance.Material.Widget.TextView"

                android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"

                android:elevation="2dp" />



            <com.android.settings.widget.LabeledSeekBar
@@ -102,7 +102,7 @@ 
                android:layout_height="wrap_content"

                android:text="@string/screen_zoom_summary"

                android:layout_marginBottom="16dp"

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

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

        </LinearLayout>

    </ScrollView>

</LinearLayout>