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

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

Merge "Update Settings text styles to use DeviceDefault."

parents 2541da8d a5e8bddc

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>